Merge remote-tracking branch 'refs/remotes/ivan/bug/do-not-decode-decrypted-data...
authorTomás Touceda <chiiph@leap.se>
Fri, 17 Jan 2014 18:53:03 +0000 (15:53 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 17 Jan 2014 18:53:03 +0000 (15:53 -0300)

Trivial merge