Merge remote-tracking branch 'chiiph-github/bug/versioneer_windows' into develop
authorKali Kaneko <kali@leap.se>
Tue, 17 Dec 2013 20:00:37 +0000 (16:00 -0400)
committerKali Kaneko <kali@leap.se>
Tue, 17 Dec 2013 20:00:37 +0000 (16:00 -0400)

Trivial merge