Merge remote-tracking branch 'anovicecodemonkey/TEDIEimprovements'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 20 Mar 2014 15:24:34 +0000 (16:24 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 20 Mar 2014 15:24:34 +0000 (16:24 +0100)

Trivial merge