Dan Poltawski 6f4747d7b4 Merge branch 'MDL-42340-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
	theme/bootstrapbase/style/moodle.css
2013-10-22 12:16:50 +02:00
..