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

Trivial merge