Merge remote-tracking branch 'origin/master'
authorPhilipp Marek <philipp@marek.priv.at>
Sun, 9 Mar 2014 19:59:39 +0000 (20:59 +0100)
committerPhilipp Marek <philipp@marek.priv.at>
Sun, 9 Mar 2014 19:59:39 +0000 (20:59 +0100)

Trivial merge