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

.htaccess

apps/calendar/js/calendar.js

apps/files_texteditor/ajax/loadfile.php

apps/files_texteditor/ajax/savefile.php

apps/files_texteditor/appinfo/app.php

apps/files_texteditor/appinfo/info.xml

apps/files_texteditor/css/style.css

apps/files_texteditor/js/aceeditor/ace-uncompressed.js

apps/files_texteditor/js/aceeditor/ace.js

apps/files_texteditor/js/aceeditor/cockpit-uncompressed.js

apps/files_texteditor/js/aceeditor/cockpit.js

apps/files_texteditor/js/aceeditor/keybinding-emacs.js

apps/files_texteditor/js/aceeditor/keybinding-vim.js

apps/files_texteditor/js/aceeditor/mode-c_cpp.js

apps/files_texteditor/js/aceeditor/mode-clojure.js

apps/files_texteditor/js/aceeditor/mode-coffee.js

apps/files_texteditor/js/aceeditor/mode-csharp.js

apps/files_texteditor/js/aceeditor/mode-css.js

apps/files_texteditor/js/aceeditor/mode-groovy.js

apps/files_texteditor/js/aceeditor/mode-html.js