Merge remote-tracking branch 'chiiph/bug/versioneer_windows' into develop
authorKali Kaneko <kali@leap.se>
Tue, 17 Dec 2013 20:02:42 +0000 (16:02 -0400)
committerKali Kaneko <kali@leap.se>
Tue, 17 Dec 2013 20:02:42 +0000 (16:02 -0400)
commitf703b0d41889c0c5827efd084609ea585ef19055
tree132e285ac765bc95f513f197e258295476c63a29
parent3d7d74fa5759b168eb57e4259ad56bcb71f9a4a0
parent7af63367cacd7f3d16b6347e6d05dacb733e10bf
Merge remote-tracking branch 'chiiph/bug/versioneer_windows' into develop