Merge branch 'master' into Mirio/catharsis
authorMirio <opivy@hotmail.de>
Sun, 6 Sep 2015 15:50:14 +0000 (17:50 +0200)
committerMirio <opivy@hotmail.de>
Sun, 6 Sep 2015 15:50:14 +0000 (17:50 +0200)
commite4779ccad84321af744bb8ca2c6f667e111fca5b
treeadd7c1c0fea005e9dc0c3e3a8f3369d261f6cc72
parente66eb4548255d07f69997e03d140c6e2b77e5eac
parent30071e1cf51f733e61d5b245b164ab302cc784bf
Merge branch 'master' into Mirio/catharsis