Merge branch 'MDL-36741_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
authorSam Hemelryk <sam@moodle.com>
Sun, 6 Jan 2013 20:15:34 +0000 (09:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 6 Jan 2013 20:15:34 +0000 (09:15 +1300)
commita589b0dc77c13fe0fafb03bbd134a6b40c12bf98
tree4092b8514588e4c13bd1d05e144dbc94bcf19d44
parent10ad21dc9a50c4720bf69fa0224eeb28a892e997
parent6e726489e7b53d6e5e6008ef101b4c3a76bcfd22
Merge branch 'MDL-36741_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE