Merge remote-tracking branch 'upstream/master'
authorPierre Rudloff <contact@rudloff.pro>
Mon, 2 Sep 2013 23:27:49 +0000 (01:27 +0200)
committerPierre Rudloff <contact@rudloff.pro>
Mon, 2 Sep 2013 23:27:49 +0000 (01:27 +0200)

Trivial merge