Merge tag 'v2.0.1' into 2.0
authorKlaas Freitag <freitag@owncloud.com>
Fri, 16 Oct 2015 08:06:38 +0000 (10:06 +0200)
committerKlaas Freitag <freitag@owncloud.com>
Fri, 16 Oct 2015 08:06:38 +0000 (10:06 +0200)
Version 2.0.1


Trivial merge