Merge remote-tracking branch 'aajanki/wdr_live'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 26 Feb 2015 00:34:01 +0000 (01:34 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 26 Feb 2015 00:34:01 +0000 (01:34 +0100)

Trivial merge