Merge branch 'master' into next0.0
commitb30f814dc39eda01b7802ba6d4bd338ff4ce1176
authorCorvus Corax <corvuscorax@cybertrench.com>
Tue, 23 Jun 2015 19:44:17 +0000 (23 21:44 +0200)
committerCorvus Corax <corvuscorax@cybertrench.com>
Tue, 23 Jun 2015 19:44:17 +0000 (23 21:44 +0200)
tree7892ea4dd670c865f2e4a122d0f5b9101afb0e7d
parentbd9fdba2c532609a0c149c7baa287791aceb331f
parentb73dba50938156b4bb0049e8e294f8f86638ccca
Merge branch 'master' into next