Merge branch 'release/0.2.12' into develop
authorJan Dittberner <jan@dittberner.info>
Sat, 5 Jan 2013 13:27:23 +0000 (14:27 +0100)
committerJan Dittberner <jan@dittberner.info>
Sat, 5 Jan 2013 13:27:23 +0000 (14:27 +0100)

Trivial merge