Simon Birnbach a384fcb99f Merge git://gitorious.org/owncloud/owncloud ... Conflicts: files/css/files.css files/js/files.js		2012-04-15 15:59:57 +02:00
..
files.css	Merge git://gitorious.org/owncloud/owncloud	2012-04-15 15:59:57 +02:00