Merge pull request #388 from owncloud/setup_additions
authormasensio <masensio@solidgear.es>
Thu, 6 Feb 2014 17:42:33 +0000 (18:42 +0100)
committermasensio <masensio@solidgear.es>
Thu, 6 Feb 2014 17:42:33 +0000 (18:42 +0100)
Setup additions


Trivial merge