Merge remote-tracking branch 'drebs/feature/3397-keymanager-should-support-bundled...
authorTomás Touceda <chiiph@leap.se>
Thu, 8 Aug 2013 14:08:18 +0000 (11:08 -0300)
committerTomás Touceda <chiiph@leap.se>
Thu, 8 Aug 2013 14:08:18 +0000 (11:08 -0300)
commitf2eeb227d272f00d7d96f14b1f178656112f3292
treedd03b3e26081be9eb5da513986a7b944b26acdba
parent8c1200d745185cdee1d17b127797f8da2da29c80
parent5cb58ca086e88951b0313d7d4dc48a9f4c0c85b5
Merge remote-tracking branch 'drebs/feature/3397-keymanager-should-support-bundled-gpg' into develop