Merge remote-tracking branch 'David-Development/rtl2.py'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 25 Jan 2015 16:55:31 +0000 (17:55 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 25 Jan 2015 16:55:31 +0000 (17:55 +0100)

Trivial merge