Merge branch 'm27_MDL-46961' of https://github.com/danmarsden/moodle into MOODLE_27_S...
commit3b35ea46865c347622ef734ccc239243e4126a57
authorDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 07:29:03 +0000 (1 15:29 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 07:29:03 +0000 (1 15:29 +0800)
tree887778d271702393b9f9d2d83c5d99fd84459174
parent5a9dde69b1634cdc2062ff2365e735ca46537b5c
parent641351118ea32f2e816fa5dbf1f2511a10acf421
Merge branch 'm27_MDL-46961' of https://github.com/danmarsden/moodle into MOODLE_27_STABLE