tree 8dc0ae113be25c05086929a34c7099b22f404e9e
parent 79d15a585da5dd48381e0e50f8e87a8d24604c9c
parent 2841e4d08ccb6cbe592cd6ddecec1d0c1ab7e51c
author David Pursehouse <dpursehouse@collab.net> 1475161169 +0900
committer David Pursehouse <dpursehouse@collab.net> 1475161193 +0900

Merge branch 'stable-2.10' into stable-2.11

Change-Id: Ic579b2f70b9ef77b46e205ffa9866697eaf3cf61