Merge remote-tracking branch 'MikeCol/extremetube-gay'
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 19 Apr 2014 10:59:52 +0000 (12:59 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 19 Apr 2014 10:59:52 +0000 (12:59 +0200)

Trivial merge