Merge branch 'master' into stable-4.0
commit8f5a2665bb41db2226ed32f49ddf67fc58074cab
authorMatthias Sohn <matthias.sohn@sap.com>
Mon, 4 May 2015 20:14:30 +0000 (4 22:14 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Mon, 4 May 2015 20:14:44 +0000 (4 22:14 +0200)
treed7121d1e0a940a3e5b114b849e6d69055f31e8ff
parent68cf77a93f5b82d80141bfd7456b49421480d6a5
parent274817ca5ed97a4ce20255ceb8b0056809063f5c
Merge branch 'master' into stable-4.0

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