Michael Gapczynski b5889d6ffe Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127 ... Conflicts: apps/files_external/templates/settings.php lib/template.php		2012-06-13 15:17:46 -04:00
..
settings.php	Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127	2012-06-13 15:17:46 -04:00