Merge branch 'master' into develop
authorJan Dittberner <jan@dittberner.info>
Sat, 8 Feb 2014 10:57:24 +0000 (11:57 +0100)
committerJan Dittberner <jan@dittberner.info>
Sat, 8 Feb 2014 10:57:24 +0000 (11:57 +0100)

Trivial merge