Merge branch 'master' into global-anims
authorHolger Schemel <info@artsoft.org>
Tue, 1 Mar 2016 23:56:08 +0000 (00:56 +0100)
committerHolger Schemel <info@artsoft.org>
Tue, 1 Mar 2016 23:56:08 +0000 (00:56 +0100)
commit30f5fd7b8f2235820dcbe638a18319d802317530
tree113f91c3a0b4c5800686fac833e6bf3320fbc7c7
parentf78f30b84a0345ea31b30c5bd95e338c9d9ebd4b
parent4c97b1045b53135f75e9324747abb5e9286b813d
Merge branch 'master' into global-anims