Merge pull request #3702 from owncloud/updates2-0
authorCarla Schroder <carla@owncloud.com>
Sat, 29 Aug 2015 15:08:03 +0000 (17:08 +0200)
committerCarla Schroder <carla@owncloud.com>
Sat, 29 Aug 2015 15:08:03 +0000 (17:08 +0200)
updates for 2.0 release


Trivial merge