Merge branch 'MDL-36897_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Thu, 13 Dec 2012 01:55:07 +0000 (09:55 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 13 Dec 2012 01:55:07 +0000 (09:55 +0800)
commit137d63fe966f8b78abda60afba8254b9548833dc
tree65a8e6b116c200d3c6b2cd54bd425f4eba00180b
parent9391d2f4cf1c0a86d765082bf58f4428964dbff8
parentd8a7ef0e427467f2d3396366c1c4e54591b602c3
Merge branch 'MDL-36897_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE