Merge branch 'tine20.com/2012.10' into 2013.03
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Mar 2013 10:18:28 +0000 (11:18 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Mar 2013 10:18:28 +0000 (11:18 +0100)
commitc4b1e79da2e2f9889297a1df61654bfad7d59b4d
treea4fcd7d2b590c71bfb524cef6e80ee36f9d3a2a5
parent82ab90f81214b6554e9699b219c2e9db0d4f4ee2
parent9a9c22f1557a3c2763e91e49a60e233b65e274b9
Merge branch 'tine20.com/2012.10' into 2013.03