Merge remote-tracking branch 'zackfern/foxgay'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 4 Dec 2014 07:20:01 +0000 (08:20 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 4 Dec 2014 07:20:01 +0000 (08:20 +0100)

Trivial merge