Merge branch '2012.10'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Nov 2012 09:11:15 +0000 (10:11 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Nov 2012 09:11:15 +0000 (10:11 +0100)
commitcf77b4313c272471dd8c7abbcc5ab1717db474b9
tree430b4e16a707802f34d179541fbed963fdc90bcb
parentfd4e0875f449b67d193fc1ec7abbf3ed84c91915
parent6725838313948e73098efda02c400069997e2867
Merge branch '2012.10'