Merge branch 'tine20.com/2012.10' into 2013.03
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 5 Mar 2013 14:18:18 +0000 (15:18 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 5 Mar 2013 14:18:18 +0000 (15:18 +0100)
commit3e57e7a60d52c4d4832f0124baabeb6919a0d0c6
treec905722d12b3553ab07eac65d6bda0daa53f3872
parent3c4cb38714dd8ce5a6d1e1cfc3a04784dffb978c
parent126a447296cc5562e78cf54261d29cc645adde71
Merge branch 'tine20.com/2012.10' into 2013.03