tree 43ca31d35c2cf7dfb5de5782c7ce923efa3b8b96
parent 9b6ebdfa970ff5828178be46384c8befb8084d5a
parent 60bc643bb30d2664c0abe138347d51366a1f8e33
author David Pursehouse <dpursehouse@collab.net> 1551316419 +0900
committer David Pursehouse <dpursehouse@collab.net> 1551316419 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Add the standard LICENSE file

Change-Id: I73ead5575703040f543a07b2cb1a6c9a260ca86d