Merge branch '2014.09' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jul 2015 10:01:21 +0000 (12:01 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jul 2015 10:01:21 +0000 (12:01 +0200)
commitd7c70e98f14ed759cd4d3a0746af8a9780701f87
treeaaa6d67d5a966232a6da2646ca54539e2faf0324
parentd9a87907e7e4630bc350c48d119bcdb42a7c86ad
parent771a2ea6c3976adb479fc29fe142d82c03a12e90
Merge branch '2014.09' into 2015.07