Merge remote-tracking branch 'upstream/master'
authorPierre Rudloff <contact@rudloff.pro>
Fri, 30 Aug 2013 22:37:29 +0000 (00:37 +0200)
committerPierre Rudloff <contact@rudloff.pro>
Fri, 30 Aug 2013 22:37:29 +0000 (00:37 +0200)

Trivial merge