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)
commit60abdca26f5945efbed670a3ae43b73b6114dd55
tree91075af6af4efc0777f5a225fd832f43e4482bae
parent03d3427b30f7bd242d77a07c6fdca1b51a51cdc9
parentf3f8ab3b8b2c2a3fd444bc67f4a11d2e93fbfb0c
Merge branch 'release-0.0.4' into develop