Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 9 Mar 2014 17:08:16 +0000 (18:08 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 9 Mar 2014 17:08:16 +0000 (18:08 +0100)

Trivial merge