Merge remote-tracking branch 'upstream/master'
authorPierre Rudloff <contact@rudloff.pro>
Thu, 22 Aug 2013 12:04:30 +0000 (14:04 +0200)
committerPierre Rudloff <contact@rudloff.pro>
Thu, 22 Aug 2013 12:04:30 +0000 (14:04 +0200)

Trivial merge