Merge branch 'master' into mirio/implosion
authorMirio <opivy@hotmail.de>
Thu, 27 Nov 2014 00:02:50 +0000 (01:02 +0100)
committerMirio <opivy@hotmail.de>
Thu, 27 Nov 2014 00:02:50 +0000 (01:02 +0100)
commit76cb07e29ebf458c5010ed0b3f7848246be018e0
tree5ea9b4cc830552bbd3cbdb8305537e6103e91080
parent9f041f13220f75aa3116ec05751e6b83feab68da
parentf167a631c3356f9a44507874dfe04a0f1a35429e
Merge branch 'master' into mirio/implosion