Merge branch 'MDL-47425-27' of git://github.com/zbdd/moodle into MOODLE_27_STABLE
commit1ffb2f5e2e321faa34b31725271121a36a786167
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Jan 2015 05:43:35 +0000 (12 13:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Jan 2015 05:43:35 +0000 (12 13:43 +0800)
tree0c0574663f3227e38d7ad3ff529fad458a9689e2
parentc7a0ba9623a1e31e1b163f713859ca64a0b309a6
parent7e6411aae55f57c43ff653e2415fd44b3b74a299
Merge branch 'MDL-47425-27' of git://github.com/zbdd/moodle into MOODLE_27_STABLE