Merge branch 'MDL-23839-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 25 Nov 2014 01:07:08 +0000 (14:07 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 25 Nov 2014 01:07:08 +0000 (14:07 +1300)
commit328e4e4c7736f9302f44e112edc312aeb4fe1707
treefa9ef0b285a6f9bf18cbb1483f5da575baf5f347
parente445e28d6ca9baf59d20e3cc2998c3e053106304
parent494cf9b81c1d3cc1185bbbcd88db0759a71177f2
Merge branch 'MDL-23839-master' of git://github.com/andrewnicols/moodle