Merge remote-tracking branch 'cryptonaut/adultswim'
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 6 Dec 2014 10:55:24 +0000 (11:55 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 6 Dec 2014 10:55:24 +0000 (11:55 +0100)

Trivial merge