Merge branch 'master' into stable-4.2
commitc28f06c0a4ea9c4c7e4c0584f661e54c205d423c
authorMatthias Sohn <matthias.sohn@sap.com>
Mon, 14 Dec 2015 23:29:50 +0000 (15 00:29 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Mon, 14 Dec 2015 23:30:01 +0000 (15 00:30 +0100)
tree3c8476da587868942ed401780e236c9575a4d190
parent3eba0a06cba84db72253ef10b55b878490f3e810
parent72f0a440a413b6f96d5e6434cd14ea4bf330c1a0
Merge branch 'master' into stable-4.2

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