Merge branch 'upstream'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Sun, 1 Jun 2014 08:21:41 +0000 (10:21 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Sun, 1 Jun 2014 08:21:41 +0000 (10:21 +0200)

Trivial merge