Merge branch 'release/0.3.2' 0.3.2
authorJan Dittberner <jan@dittberner.info>
Thu, 10 Apr 2014 16:07:24 +0000 (18:07 +0200)
committerJan Dittberner <jan@dittberner.info>
Thu, 10 Apr 2014 16:07:24 +0000 (18:07 +0200)

Trivial merge