]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #4145 from owncloud/fix-failing-master
authoricewind1991 <icewind1991@gmail.com>
Sun, 21 Jul 2013 11:31:27 +0000 (04:31 -0700)
committericewind1991 <icewind1991@gmail.com>
Sun, 21 Jul 2013 11:31:27 +0000 (04:31 -0700)
Fix failing master


Trivial merge