tree 469b9dd856f215602ad02101d4e90817a7fbd833
parent 315d393564cffec11ea0c94419bc5bf40f68fd37
parent 20021ba168c09053b5eb82579cee534770da779e
author David Pursehouse <dpursehouse@collab.net> 1551315130 +0900
committer David Pursehouse <dpursehouse@collab.net> 1551315130 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Add the standard LICENSE file

Change-Id: Id5f811d1bc11b3a294ae7c254429cda524b122ef