Merge pull request #32 from nextcloud-gmbh/oc_master
authorRoeland Jago Douma <rullzer@users.noreply.github.com>
Wed, 28 Jun 2017 11:24:24 +0000 (13:24 +0200)
committerGitHub <noreply@github.com>
Wed, 28 Jun 2017 11:24:24 +0000 (13:24 +0200)
Oc master


Trivial merge