Merge branch 'master' of ralfj.de:saartuer
authorRalf Jung <post@ralfj.de>
Wed, 23 Oct 2013 16:51:40 +0000 (18:51 +0200)
committerRalf Jung <post@ralfj.de>
Wed, 23 Oct 2013 16:51:40 +0000 (18:51 +0200)

Trivial merge