Ghostkeeper da1d59ff98 Merge branch 15.10 into master
Where automatic merging failed, the version of 15.10 was used.
2015-10-16 16:56:59 +02:00
..
2015-10-08 12:13:35 +02:00
2015-10-16 16:56:59 +02:00