Merge remote-tracking branch 'origin/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Sat, 23 Aug 2014 23:34:28 +0000 (01:34 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sat, 23 Aug 2014 23:34:28 +0000 (01:34 +0200)

Trivial merge