tree a931ad4e53b7141aac50496d04bc6dd13eed250a
parent b56f2a625d22488afa52469a5d94e133e448a3d5
parent 70cdbbc977828d0988aa7e862ac7714a5aadee75
author Edwin Kempin <edwin.kempin@sap.com> 1435569919 +0200
committer Edwin Kempin <edwin.kempin@sap.com> 1435569939 +0200

Merge branch 'stable-2.11'

* stable-2.11:
  Define local licenses

Change-Id: I6b7bf2da27ee372eff5a803728b029b9a67a0c51