Merge branch 'MDL-42876-master' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Dec 2013 01:04:09 +0000 (14:04 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Dec 2013 01:04:09 +0000 (14:04 +1300)
commitc619d3d48d92077a01cbdcd71a87f85464565db6
treed7a6fe23bf34e0213695c26458acfac85a080d66
parent12539749f478643be9dfeee987e52f71aa298eea
parentad417fdfe738e15231e7dcbddec2017c71a20e71
Merge branch 'MDL-42876-master' of git://github.com/mouneyrac/moodle