Merge remote-tracking branch 'akirk/ellentv'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 15 Aug 2014 08:55:54 +0000 (10:55 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 15 Aug 2014 08:55:54 +0000 (10:55 +0200)

Trivial merge