Merge remote-tracking branch 'yasoob/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 21 Aug 2014 23:38:59 +0000 (01:38 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 21 Aug 2014 23:38:59 +0000 (01:38 +0200)

Trivial merge