Merge remote-tracking branch 'upstream/master'
authorPierre Rudloff <contact@rudloff.pro>
Sat, 24 Aug 2013 21:01:39 +0000 (23:01 +0200)
committerPierre Rudloff <contact@rudloff.pro>
Sat, 24 Aug 2013 21:01:39 +0000 (23:01 +0200)

Trivial merge