Merge branch 'master' into t0uYK8Ne/finalrage 69/head
authorMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:19:03 +0000 (21:19 +0100)
committerMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:19:03 +0000 (21:19 +0100)
commit5f1bee747045ca71f27dee3626f134a0bc96bd25
tree8c4deb71e2b8e2970cc55c666afe5d2cce5de849
parent7e77cb51d2ab48289af19a76a3a6e8e8e4697059
parent6ad6e3c8548cf1f0cf081237375b06c3aa52f9a7
Merge branch 'master' into t0uYK8Ne/finalrage