Merge branch '2015.07'
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 21 Sep 2015 15:29:48 +0000 (17:29 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 21 Sep 2015 15:29:48 +0000 (17:29 +0200)
commitd06ffcd3670188a439e66499dd4dbc7d804ed22e
tree2ad5ae3e6a0df2b9eab8a4093d8b6f4a1046939c
parent5da88205ea0594b99034d83deff55cfb89ff8f16
parente7a155e20ed8ec01b864adef00ef86227fb35805
Merge branch '2015.07'