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)
commitee0b7212d29624b6321a0eda9c7ba1e17817ba25
tree57803a4f8782d6cf80cfdaebf21be7b89b9cdd07
parent78697b81bba72dcf7ee2c951e249964d235880f6
parent162a992f0f857ef0969d64206b9762f0d054528f
Merge branch 'upstream'