| commit | 4f3ad6d289e529d4c044f5fd56c6ffb6cceeee9b | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Fri Sep 30 19:12:04 2016 +0900 |
| committer | David Pursehouse <dpursehouse@collab.net> | Fri Sep 30 19:12:13 2016 +0900 |
| tree | 3c46d3bc70c458adbcc6f4ed23ea958f02f67391 | |
| parent | 46e580a407be8ef77a1f6cbc7a147c0c0deba3d9 [diff] | |
| parent | a287ad6b8d0a12c444765584b0b448f7c6dd39d3 [diff] |
Merge branch 'stable-2.12' Change-Id: I432017e64c5b066daf375306379ace3326ead6c5