Merge branch 'master' of ralfj.de:saartuer
authormar-v-in <github@rvin.mooo.com>
Wed, 23 Oct 2013 20:03:27 +0000 (22:03 +0200)
committermar-v-in <github@rvin.mooo.com>
Wed, 23 Oct 2013 20:03:27 +0000 (22:03 +0200)

Trivial merge