Merge branch 'master' of ssh://git.camperquake.de:22003/quotesite master
authorRalf Ertzinger <ralf@skytale.net>
Mon, 19 Aug 2013 21:41:03 +0000 (23:41 +0200)
committerRalf Ertzinger <ralf@skytale.net>
Mon, 19 Aug 2013 21:41:03 +0000 (23:41 +0200)

Trivial merge