Merge branch release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 26 May 2016 11:17:21 +0000 (13:17 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Thu, 26 May 2016 11:18:04 +0000 (13:18 +0200)
commit6966c327688ecd09654087fc822ede57bd0f918a
tree33e43a355bc2781246663603f8cbd33b0d97dbe7
parentf86688b5365398440ed943d9a30bfa699d24d487
parent3a9e67dd55949e7daaa666e5bc4de95bcfece2c4
Merge branch release-2016

Change-Id: I56b8e747f90364d3c546111060ef9ff137a90770