Merge pull request #1174 from owncloud/release_bug_fixes
authormasensio <masensio@solidgear.es>
Thu, 24 Sep 2015 15:33:22 +0000 (17:33 +0200)
committermasensio <masensio@solidgear.es>
Thu, 24 Sep 2015 15:33:22 +0000 (17:33 +0200)
Fixed a couple of tiny bugs


Trivial merge