Merge branch 'release-0.0.4' into develop 0.0.4
authordb <drebs@riseup.net>
Thu, 8 Jan 2015 17:39:54 +0000 (15:39 -0200)
committerdb <drebs@riseup.net>
Thu, 8 Jan 2015 17:39:54 +0000 (15:39 -0200)

Trivial merge