Merge branch 'master' into mirio/implosion
authorMirio <opivy@hotmail.de>
Tue, 18 Nov 2014 15:50:58 +0000 (16:50 +0100)
committerMirio <opivy@hotmail.de>
Tue, 18 Nov 2014 15:50:58 +0000 (16:50 +0100)
commit3ee6bcd6a40be04dff24eee39d37b9f0f3094561
treedbb05128e5e3f1a7f96bafada52849be5480cc3c
parentb4c7848d5e9726fa51a97164aba109fe5d2818c5
parent24b0616986e4485003936128293a4a3c2145ebe8
Merge branch 'master' into mirio/implosion