leap_pycommon.git, branch 0.2.5 [leap_pycommon] Merge remote-tracking branch 'drebs/feature/2683-move-keymanager-to-leap_client' into develop 2013-05-30T13:28:52+00:00 Tomás Touceda chiiph@leap.se 2013-05-30T13:28:52+00:00 dbbf33d27268266088ee1ab15fc04cef33259250 






Remove deps on soledad and python-gnupg.
2013-05-30T13:05:13+00:00

drebs
drebs@leap.se

2013-05-30T13:05:13+00:00

7f35ec61513d4286bde08ba957945b38b85ca87a












Merge remote-tracking branch 'kali/bug/add-data-files' into develop
2013-05-29T18:13:21+00:00

Tomás Touceda
chiiph@leap.se

2013-05-29T18:13:21+00:00

0a795cceb0f5902cb928b9b67bd91d0050459238












add data files: testing certificates
2013-05-29T17:39:16+00:00

Kali Kaneko
kali@leap.se

2013-05-29T17:38:03+00:00

b00bb5cf4af7183076c02b02722ed6c495ff3f8a












Remove keymanager from this repository.
2013-05-29T13:20:16+00:00

drebs
drebs@leap.se

2013-05-29T13:18:44+00:00

de1677894afd4dd85e9616d5cf58bfe86bd866e2












Merge remote-tracking branch 'drebs/feature/2341-use-indexes-to-store-and-fetch-keys' into develop
2013-05-29T12:50:38+00:00

Tomás Touceda
chiiph@leap.se

2013-05-29T12:50:38+00:00

cec2baa24f454c9f9168b5faed1a465e9943f591

Conflicts:
	src/leap/common/keymanager/keys.py





Conflicts:
	src/leap/common/keymanager/keys.py







Merge remote-tracking branch 'kali/bug/allow-absolute-paths2' into develop
2013-05-28T20:38:30+00:00

Tomás Touceda
chiiph@leap.se

2013-05-28T20:38:30+00:00

205fcd6c6bb8712a115f3dfe738c490f5427e09b












change docstring comments to use sphinx style
2013-05-28T20:05:09+00:00

Kali Kaneko
kali@leap.se

2013-05-28T20:00:22+00:00

354467c605f07042568c10c3e931f7fc093c0bf4












allow absolute paths to config.load
2013-05-28T20:05:01+00:00

Kali Kaneko
kali@leap.se

2013-05-28T19:04:14+00:00

9c12f4cce20ea1dea7e39cda583cb29ded4b4e1a












Fix wrong iv test to account for new form of iv.
2013-05-28T14:41:33+00:00

drebs
drebs@leap.se

2013-05-28T14:41:33+00:00

7fc904d797cb3c07f593157df1126b4179fe48d8