Merge remote-tracking branch 'GerritTine20Com/tine20.com/2012.10' into tine20.org...
authorLars Kneschke <l.kneschke@metaways.de>
Mon, 11 Mar 2013 05:22:44 +0000 (06:22 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Mon, 11 Mar 2013 05:22:44 +0000 (06:22 +0100)

Trivial merge