Merge branch 'feat/async_gpg' into develop
authorRuben Pollan <meskio@sindominio.net>
Tue, 23 Feb 2016 17:42:01 +0000 (11:42 -0600)
committerRuben Pollan <meskio@sindominio.net>
Tue, 23 Feb 2016 17:42:01 +0000 (11:42 -0600)

Trivial merge