Merge branch 'MDL-41878-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 19:14:36 +0000 (08:14 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 19:14:36 +0000 (08:14 +1300)
commit7f58018843213a81626e5b439da6b08dea4b1ccc
tree47c38887c1032e411ea480dcf5ff6cfa266612eb
parent098723aabb69854d08285dc56bcee949ffb6a9ab
parent03e36e70775681b0f8cf41e767fa90876ffc760c
Merge branch 'MDL-41878-master' of git://github.com/andrewnicols/moodle