Merge remote-tracking branch 'mfischer/gnupg' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 16:23:42 +0000 (17:23 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 16:23:42 +0000 (17:23 +0100)
commit32bda1fb6e7a7571c2567d3b5d575862e2549e3a
tree08db7d11ee153868c723c06103e2991f7194f8aa
parentf184f593e35c12f9f2a4cef2e4922011162cf1f5
parentb92f39bcacc61f912ab2ca19b46bb90e2bbaee08
Merge remote-tracking branch 'mfischer/gnupg' into next