Merge branch 'master' into matthiaskrgr/atelier
authorMirio <opivy@hotmail.de>
Mon, 13 Mar 2017 16:11:49 +0000 (17:11 +0100)
committerMirio <opivy@hotmail.de>
Mon, 13 Mar 2017 16:11:49 +0000 (17:11 +0100)
commit0a1d4da591828f114f5a527a2d885a790f4a2df0
tree09cd7a4bf7afa00354727fb47a8baf422204a3c7
parent00c77b85af5401f780b311ea951bd066ad774297
parent7238b80221f7ee48494d53c0b72ddf81f67850c3
Merge branch 'master' into matthiaskrgr/atelier