Merge remote-tracking branch 'upstream/master'
authorPierre Rudloff <contact@rudloff.pro>
Mon, 26 Aug 2013 01:16:42 +0000 (03:16 +0200)
committerPierre Rudloff <contact@rudloff.pro>
Mon, 26 Aug 2013 01:16:42 +0000 (03:16 +0200)

Trivial merge