Merge branch 'release-0.0.2' 0.0.2
authordrebs <drebs@leap.se>
Tue, 5 Nov 2013 17:12:33 +0000 (15:12 -0200)
committerdrebs <drebs@leap.se>
Tue, 5 Nov 2013 17:12:33 +0000 (15:12 -0200)

Trivial merge