Merge pull request #324 from owncloud/last_minute_release-1.5.2
authormasensio <masensio@solidgear.es>
Tue, 10 Dec 2013 13:50:01 +0000 (05:50 -0800)
committermasensio <masensio@solidgear.es>
Tue, 10 Dec 2013 13:50:01 +0000 (05:50 -0800)
Last minute additions for release 1.5.2


Trivial merge