Merge remote-tracking branch 'upstream/master'
authorPierre Rudloff <contact@rudloff.pro>
Tue, 27 Aug 2013 08:47:47 +0000 (10:47 +0200)
committerPierre Rudloff <contact@rudloff.pro>
Tue, 27 Aug 2013 08:47:47 +0000 (10:47 +0200)

Trivial merge