Merge "Merge branch release-5-1 into release-2016" into release-2016
authorDavid van der Spoel <davidvanderspoel@gmail.com>
Fri, 8 Jul 2016 14:24:25 +0000 (16:24 +0200)
committerDavid van der Spoel <davidvanderspoel@gmail.com>
Fri, 8 Jul 2016 14:24:25 +0000 (16:24 +0200)
commit156562e0f60f87c07bd2cebe6b5a7f4ec0d30600
treefe1bd540647603d51371caa41f705575b35cf62b
parent9aef7701dd0027b487ee8b3fbed0df2834002ed0
parent612274586adf48f4131541d11abf9e92837ac77b
Merge "Merge branch release-5-1 into release-2016" into release-2016