Merge branch 't0uYK8Ne/catharsis' into 'master'
authorMirio <opivy@hotmail.de>
Fri, 17 Mar 2017 22:44:48 +0000 (22:44 +0000)
committerMirio <opivy@hotmail.de>
Fri, 17 Mar 2017 22:44:48 +0000 (22:44 +0000)
commitdbd017299832eddb275856eb15b36b8875f2cbce
tree07b4faa03e3674e850e1744546bdc949373cfe75
parent469ec689c86f1ca6f23ade5f8b6af17531995c80
parent3ec42c7409a83b291a218d95300eb6021cac1229
Merge branch 't0uYK8Ne/catharsis' into 'master'

catharsis: fix various issues

See merge request !88