Merge branch 'MDL-47340-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE
commit779d68eb8a31a607e635c0288c81aa71ec078749
authorMarina Glancy <marina@moodle.com>
Fri, 24 Oct 2014 03:55:16 +0000 (24 11:55 +0800)
committerMarina Glancy <marina@moodle.com>
Fri, 24 Oct 2014 03:55:16 +0000 (24 11:55 +0800)
treea8a3c115f6c6cd226a14138be582936c883bcc29
parent441a8a209bc360597f17e1b2b29e516109a983d7
parentf5beaa7e008eaffacaede16dea2be25a65ad9fcb
Merge branch 'MDL-47340-27' of git://github.com/jethac/moodle into MOODLE_27_STABLE