Merge remote-tracking branch 'kali/feature/add_versioneer' into develop
authorTomás Touceda <chiiph@leap.se>
Fri, 23 Aug 2013 13:24:34 +0000 (10:24 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 23 Aug 2013 13:24:34 +0000 (10:24 -0300)
commit1bfd035337671f9d3fbd13370ddd1fae52f65b33
tree505ffcb677cddacf63c989dcb74d015fe02fb3f2
parentaf89e94e995c1df6e78a87306bb609b0b8dfe20d
parent58aaf9c4b4159aeda8acb2485dc479017b83d096
Merge remote-tracking branch 'kali/feature/add_versioneer' into develop

Conflicts:
setup.py
setup.py