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

Trivial merge