Merge branch 'master' of gitorious.org:owncloud/owncloud

3rdparty/mediawiki/CSSMin.php

3rdparty/mediawiki/JavaScriptMinifier.php

apps/calendar/ajax/import/import.php

apps/calendar/import_tmp/Info

apps/calendar/js/loader.js

apps/calendar/templates/part.import.php

apps/contacts/import.php

apps/contacts/import_tmp/Info

apps/contacts/js/loader.js

apps/contacts/photo.php

apps/contacts/templates/part.import.php

apps/files/templates/index.php

apps/files_versions/ajax/getVersions.php

apps/files_versions/history.php

apps/files_versions/js/versions.js

apps/files_versions/templates/history.php

apps/files_versions/versions.php

apps/gallery/ajax/galleryOp.php

apps/gallery/ajax/sharing.php

apps/gallery/index.php