Merge branch 'master' into matthiaskrgr/SE
authorMirio <opivy@hotmail.de>
Mon, 13 Mar 2017 16:02:58 +0000 (17:02 +0100)
committerMirio <opivy@hotmail.de>
Mon, 13 Mar 2017 16:02:58 +0000 (17:02 +0100)
commitc0362e059455f88b5ed71f1fecdd0fdc618ea8de
treec0c182654e92a3ba8fa27f00e55a3db9ecd3fb64
parent4668b44289b8de969cfc8ff44e2f4b187614c06f
parent0b1711a5fee18e71321e1e84635066845e0fce1f
Merge branch 'master' into matthiaskrgr/SE