From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 16 May 2014 19:50:42 +0000 (-0300)
Subject: Merge branch 'master' into develop
X-Git-Tag: 0.3.5^2~4
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=2d5facf273018bdef3fe442a64346b24cff631dc;p=keyringer.git

Merge branch 'master' into develop
---

2d5facf273018bdef3fe442a64346b24cff631dc