Merge branch 'MDL-43721-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE
commite75faa20f64df69723410e0b15c1f8cb0247b513
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Mar 2014 19:54:32 +0000 (11 08:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Mar 2014 19:54:32 +0000 (11 08:54 +1300)
treea4ab63aaab97b6258c4eff16b68221766bb6a504
parent57ce177561d99c476a9a9fbba8050ecee21f1157
parent32c9c2588c86599c82690d369da7fd648e548c93
Merge branch 'MDL-43721-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE