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)
1  2 
setup.py

diff --cc setup.py
Simple merge