Merge remote-tracking branch 'GerritTine20Com/tine20.com/2012.10' into 2013.03
authorLars Kneschke <l.kneschke@metaways.de>
Sun, 10 Mar 2013 09:12:49 +0000 (10:12 +0100)
committerLars Kneschke <l.kneschke@metaways.de>
Sun, 10 Mar 2013 09:12:49 +0000 (10:12 +0100)

Trivial merge