Merge branch 'MDL-50880-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 20 Aug 2015 02:31:20 +0000 (10:31 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 20 Aug 2015 02:31:20 +0000 (10:31 +0800)
commit3ac1350598fb85c28d82e5dd8ea3ff6716c140f9
treee5320f354e2b193ea6137a1b904fe8968e2b97e8
parent7046798f56d344bf29b0388edc370c2039e78c18
parent40e501284cab1d9078516c42822ca1614cf9ca01
Merge branch 'MDL-50880-master' of git://github.com/marinaglancy/moodle