Merge branch 'MDL-39971_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE
commitf7c29429616221c11cac1d233974db9bbb528763
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 03:09:34 +0000 (10 15:09 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 03:09:34 +0000 (10 15:09 +1200)
treeebdfafbf65bda0aeb5fc2a055a387dc52de4798a
parent6f4232974ed56fec5b6ecb7e7140c4c598d6d133
parent8b2e668a1927b3b0f33c7d32ef31fb0947405c9f
Merge branch 'MDL-39971_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE