Merge tag 'upstream/1.2.0'
authorJean-Philippe Orsini <jeanfi@gmail.com>
Sat, 4 Feb 2017 18:15:54 +0000 (19:15 +0100)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Sat, 4 Feb 2017 18:15:54 +0000 (19:15 +0100)
commit3361fda8735c65887a859c9faf287cb105ae6bc8
treee904051d9793fae28ada9fdc8a4a05e16bb01164
parentce48267cd68a666c5fdc07992336a69f68cdb960
parentbd7036af56a4b61b2b473dccbeac5e26f78b57da
Merge tag 'upstream/1.2.0'

Upstream version 1.2.0