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)
commit8189c837a4058d4b0b8ec35a1c705d374d6793c8
treef07281566bfc6647e5adacd101547a8ccb1e9aa1
parente498d8d7e2449bba5ad016645899a9a59df4f16d
parent1ba5cb91ea5d0f29f16316d984dc685e8180b88f
Merge remote-tracking branch 'kali/bug/fix-assertion-error-gnupg' into develop