Merge remote-tracking branch 'upstream/master'
authorPierre Rudloff <contact@rudloff.pro>
Wed, 28 Aug 2013 10:20:12 +0000 (12:20 +0200)
committerPierre Rudloff <contact@rudloff.pro>
Wed, 28 Aug 2013 10:20:12 +0000 (12:20 +0200)

Trivial merge