Damyon Wiese 0610d2ca92 Merge branch 'MDL-44131-master' of git://github.com/FMCorz/moodle
Conflicts:
	lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-debug.js
	lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-min.js
	lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button.js
	lib/editor/atto/plugins/equation/yui/src/button/js/button.js
2014-04-08 14:18:50 +08:00
..
2014-03-14 13:40:11 +08:00
2014-03-14 13:38:37 +08:00
2013-09-20 17:58:35 +02:00
2014-02-26 14:39:03 +08:00
2014-03-14 13:38:37 +08:00
2014-03-14 13:40:11 +08:00