Merge branch 'dev/comp-workspaces' into for-chris-4.7-20160525
authorDavid Sterba <dsterba@suse.com>
Wed, 25 May 2016 20:51:04 +0000 (22:51 +0200)
committerDavid Sterba <dsterba@suse.com>
Wed, 25 May 2016 20:51:04 +0000 (22:51 +0200)
commit4c6143dd497901e3537dc4324dc203dfda442009
treeb2fb549b9549bead4d2837c81760cf87fa50ad43
parent42f31734eb7658fd01fb186d56312be869450a42
parentae55b9ec7ac117c05ff866500425fe8b4accfebe
Merge branch 'dev/comp-workspaces' into for-chris-4.7-20160525