Merge branch 'MDL-47590' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 16 Nov 2014 20:46:35 +0000 (09:46 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 16 Nov 2014 21:34:09 +0000 (10:34 +1300)
commitfea4baf826d5ff2a29da4ae0be7d558b50160725
treef4397861fa4d8d7e4466e141bfa3fb8501b54f0f
parent6d97620481febee35804d37e68b21cc325336f56
parentba145a9e4edf139fffba69a242dafca0c61f58d7
Merge branch 'MDL-47590' of git://github.com/timhunt/moodle