Merge remote-tracking branch 'yasoob/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 23 Jun 2013 16:45:50 +0000 (18:45 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 23 Jun 2013 16:45:50 +0000 (18:45 +0200)

Trivial merge