Merge commit '24da430324735f95880c4a4a54298dc8023125bb'
authorClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 07:26:09 +0000 (08:26 +0100)
committerClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 07:26:09 +0000 (08:26 +0100)
commit5d2354327725348f3ffc96be87e66065a92b499f
treed829c41c625bd881a7c07e174bc038d44e840c67
parent518961bc99b9eb802c5fa08b068edb9fe96a28be
parent24da430324735f95880c4a4a54298dc8023125bb
Merge commit '24da430324735f95880c4a4a54298dc8023125bb'

* commit '24da430324735f95880c4a4a54298dc8023125bb':
  Changelog: mark the release 12 branch

This commit is a noop.

Merged-by: Clément Bœsch <u@pkh.me>