Merge remote-tracking branch 'anisse/fix-content-encoding-charset'
authorPhilipp Hagemeister <phihag@phihag.de>
Mon, 7 Apr 2014 21:27:03 +0000 (23:27 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Mon, 7 Apr 2014 21:27:03 +0000 (23:27 +0200)

Trivial merge