Merge branch 'master' into stable-4.2
commit77ddf3c5c06dd91ee19eb35915301bc0cece64dd
authorMatthias Sohn <matthias.sohn@sap.com>
Thu, 21 Jan 2016 15:37:00 +0000 (21 16:37 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Thu, 21 Jan 2016 15:37:35 +0000 (21 16:37 +0100)
tree0eaadb97befaea0d85cc15d2b970f3a024d32ea6
parent4b243ed761ec170c2ed2ff0bcf63ee1ab5d7fc7b
parent40e9eb04377630ffb45799a909783b8d088e436b
Merge branch 'master' into stable-4.2

Change-Id: I02091f8885aea4c0c1966929f8874ad76bb2ab41
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>