Merge remote-tracking branch 'kali/bug/fix-assertion-error-gnupg' into develop
authorTomás Touceda <chiiph@leap.se>
Wed, 9 Oct 2013 17:29:19 +0000 (14:29 -0300)
committerTomás Touceda <chiiph@leap.se>
Wed, 9 Oct 2013 17:29:19 +0000 (14:29 -0300)

Trivial merge