Merge remote-tracking branch 'yasoob/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 25 Jun 2013 19:09:15 +0000 (21:09 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 25 Jun 2013 19:09:15 +0000 (21:09 +0200)

Trivial merge