Merge branch 'MDL-48058-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Dec 2014 00:58:15 +0000 (13:58 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Dec 2014 00:58:15 +0000 (13:58 +1300)
commit766ef7211baad31544407cb57954547cf95b381e
treec39ff453879b6ac78f8bf920d95d090e883fe5e4
parent559d6c0046f13f30b29f6f373cba0799311181eb
parent0802d98a7fbf7e03416c0b43f9e85e011496e20c
Merge branch 'MDL-48058-master' of git://github.com/andrewnicols/moodle