Merge remote-tracking branch 'upstream/master' into websurg
authorPierre Rudloff <contact@rudloff.pro>
Tue, 17 Sep 2013 21:07:44 +0000 (23:07 +0200)
committerPierre Rudloff <contact@rudloff.pro>
Tue, 17 Sep 2013 21:07:44 +0000 (23:07 +0200)

Trivial merge