branching: merge stable back into default
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 20 Oct 2017 23:03:11 +0200
changeset 3122 c80ba40d4c87
parent 3087 504f914efd29 (diff)
parent 3115 663dbef40f97 (current diff)
child 3138 8a390749ff67
branching: merge stable back into default