Conflicts:
	admin/report/unittest/lang/en/report_unittest.php
	course/externallib.php
	course/report/stats/lang/en/coursereport_stats.php
	enrol/manual/settings.php
	enrol/manual/tests/lib_test.php
	filter/glossary/lang/en/filter_glossary.php
	lang/en/question.php
	lib/editor/tinymce/plugins/ctrlhelp/version.php
	lib/editor/tinymce/plugins/wrap/lang/en/tinymce_wrap.php
	lib/yui/2.8.2/build/assets/skins/sam/imagecropper.css
	lib/yui/2.8.2/build/assets/skins/sam/layout.css
	lib/yui/2.8.2/build/assets/skins/sam/resize.css
	lib/yui/2.8.2/build/assets/skins/sam/simpleeditor.css
	lib/yui/2.8.2/build/assets/skins/sam/skin.css
	lib/yui/2.8.2/build/assets/skins/sam/slider.css
	lib/yui/2.8.2/build/button/assets/skins/sam/button.css
	lib/yui/2.8.2/build/carousel/assets/skins/sam/carousel.css
	lib/yui/2.8.2/build/editor/assets/skins/sam/editor-skin.css
	lib/yui/2.8.2/build/editor/assets/skins/sam/editor.css
	lib/yui/2.8.2/build/event-simulate/event-simulate-debug.js
	lib/yui/2.8.2/build/event-simulate/event-simulate.js
	lib/yui/2.8.2/build/imagecropper/assets/skins/sam/imagecropper.css
	lib/yui/2.8.2/build/layout/assets/skins/sam/layout.css
	lib/yui/2.8.2/build/resize/assets/skins/sam/resize.css
	lib/yui/2.8.2/build/swfdetect/swfdetect-debug.js
	lib/yui/2.8.2/build/swfdetect/swfdetect.js
	lib/yui/2.8.2/build/yuitest/yuitest-debug.js
	lib/yui/2.8.2/build/yuitest/yuitest.js
	lib/yui/3.2.0/build/console/assets/skins/sam/console-filters-skin.css
	lib/yui/3.2.0/build/dom/selector-debug.js
	lib/yui/3.2.0/build/dom/selector.js
	lib/yui/3.2.0/build/json/json-parse-debug.js
	lib/yui/3.2.0/build/json/json-parse.js
	lib/yui/3.2.0/build/json/json-stringify-debug.js
	lib/yui/3.2.0/build/json/json-stringify.js
	lib/yui/3.2.0/build/node/node-base-debug.js
	lib/yui/3.2.0/build/node/node-base.js
	lib/yui/3.2.0/build/slider/assets/slider-core.css
	lib/yui/3.2.0/build/tabview/assets/tabview.css
	lib/yui/3.2.0/build/widget/assets/widget-base-core.css
	lib/yuilib/2in3/2.9.0/build/assets/skins/sam/imagecropper.css
	lib/yuilib/2in3/2.9.0/build/yui2-event-simulate/yui2-event-simulate-debug.js
	lib/yuilib/2in3/2.9.0/build/yui2-event-simulate/yui2-event-simulate.js
	lib/yuilib/2in3/2.9.0/build/yui2-selector/yui2-selector-debug.js
	lib/yuilib/2in3/2.9.0/build/yui2-selector/yui2-selector.js
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-button/assets/skins/sam/yui2-skin-sam-button.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-button/yui2-skin-sam-button-debug.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-carousel/yui2-skin-sam-carousel-debug.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-carousel/yui2-skin-sam-carousel.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-editor/assets/skins/sam/editor-skin.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-editor/assets/skins/sam/yui2-skin-sam-editor-min.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-editor/yui2-skin-sam-editor.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-imagecropper/assets/skins/sam/imagecropper.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-layout/assets/skins/sam/yui2-skin-sam-layout-debug.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-layout/assets/skins/sam/yui2-skin-sam-layout.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-layout/yui2-skin-sam-layout.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-resize/assets/skins/sam/yui2-skin-sam-resize-debug.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-resize/assets/skins/sam/yui2-skin-sam-resize.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-resize/yui2-skin-sam-resize-debug.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-resize/yui2-skin-sam-resize.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-simpleeditor/assets/skins/sam/editor-skin.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-simpleeditor/assets/skins/sam/yui2-skin-sam-simpleeditor-min.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-simpleeditor/yui2-skin-sam-simpleeditor.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-slider/yui2-skin-sam-slider-debug.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam-slider/yui2-skin-sam-slider.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam/assets/skins/sam/yui2-skin-sam-min.css
	lib/yuilib/2in3/2.9.0/build/yui2-skin-sam/yui2-skin-sam.css
	lib/yuilib/2in3/2.9.0/build/yui2-swfdetect/yui2-swfdetect-debug.js
	lib/yuilib/2in3/2.9.0/build/yui2-swfdetect/yui2-swfdetect.js
	lib/yuilib/2in3/2.9.0/build/yui2-yuitest/yui2-yuitest-debug.js
	lib/yuilib/2in3/2.9.0/build/yui2-yuitest/yui2-yuitest.js
	lib/yuilib/3.9.1/build/clickable-rail/assets/slider-core.css
	lib/yuilib/3.9.1/build/console-filters/assets/skins/sam/console-filters-skin.css
	lib/yuilib/3.9.1/build/console/assets/skins/sam/console-filters-skin.css
	lib/yuilib/3.9.1/build/json-parse-shim/json-parse-shim-debug.js
	lib/yuilib/3.9.1/build/json-parse-shim/json-parse-shim.js
	lib/yuilib/3.9.1/build/json-stringify-shim/json-stringify-shim-debug.js
	lib/yuilib/3.9.1/build/json-stringify-shim/json-stringify-shim.js
	lib/yuilib/3.9.1/build/node-core/node-core-debug.js
	lib/yuilib/3.9.1/build/node-core/node-core.js
	lib/yuilib/3.9.1/build/slider-base/assets/slider-core.css
	lib/yuilib/3.9.1/build/tabview-base/assets/tabview.css
	lib/yuilib/3.9.1/build/tabview-plugin/assets/tabview.css
	lib/yuilib/3.9.1/build/widget-skin/assets/widget-base-core.css
	lib/yuilib/3.9.1/build/widget-uievents/assets/widget-base-core.css
	mod/assign/feedback/comments/db/access.php
	mod/assign/submission/comments/db/access.php
	mod/book/db/subplugins.php
	mod/quiz/editlib.php
	question/editlib.php
	question/type/oumultiresponse/version.php
	question/upgrade.txt