Merge remote-tracking branch 'drebs/feature/2341-use-indexes-to-store-and-fetch-keys...
authorTomás Touceda <chiiph@leap.se>
Wed, 29 May 2013 12:50:38 +0000 (09:50 -0300)
committerTomás Touceda <chiiph@leap.se>
Wed, 29 May 2013 12:50:38 +0000 (09:50 -0300)
commitcec2baa24f454c9f9168b5faed1a465e9943f591
treef5428d3c2a0a02e484a69f24063a11f1d9327dda
parent205fcd6c6bb8712a115f3dfe738c490f5427e09b
parent7fc904d797cb3c07f593157df1126b4179fe48d8
Merge remote-tracking branch 'drebs/feature/2341-use-indexes-to-store-and-fetch-keys' into develop

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