Merge remote-tracking branch 'drebs/feature/2683-move-keymanager-to-leap_client'... release/v0.2.5 0.2.5
authorTomás Touceda <chiiph@leap.se>
Thu, 30 May 2013 13:28:52 +0000 (10:28 -0300)
committerTomás Touceda <chiiph@leap.se>
Thu, 30 May 2013 13:28:52 +0000 (10:28 -0300)
commitdbbf33d27268266088ee1ab15fc04cef33259250
treeae3f597a456d1671aa1cdf334912b1422538c93b
parent0a795cceb0f5902cb928b9b67bd91d0050459238
parent7f35ec61513d4286bde08ba957945b38b85ca87a
Merge remote-tracking branch 'drebs/feature/2683-move-keymanager-to-leap_client' into develop
setup.py