Merge branch '2013.10' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Oct 2014 10:24:02 +0000 (12:24 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Oct 2014 10:24:02 +0000 (12:24 +0200)
commitc09704d33b6a96cbd2017f313390b2b9a02f5fdf
tree22c68e86182a3e45a49e09f6a2256a9ef01ac82a
parenta011b362ffb8611ac976e60aefa5e1b3e8cce50c
parent167678dd48a337711edfb49cd983ae916fe2ad10
Merge branch '2013.10' into 2014.09