tree 385af5e9a5be65d25b073eb49aa2f9b5a323e510
parent 44ba7321dc048aa288f9452afef98cb1203ea759
parent 04ff9583a02579e8cf89a636e3484853ca25a36d
author David Pursehouse <dpursehouse@collab.net> 1494468146 +0900
committer David Pursehouse <dpursehouse@collab.net> 1494468152 +0900

Merge branch 'stable-2.13'

* stable-2.13:
  Fix compilation error

Change-Id: I1b5b20873e2b194b618052d14c5b4ca31c0b9b2f