Merge branch 'MDL-52312_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 05:56:08 +0000 (13:56 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 05:56:08 +0000 (13:56 +0800)
commit948882eb5dca75a74c6336c9d1ca8019e19be893
treea2369afd0ca0b81dd5507417e2ad4756fc06868b
parent0dfcc2541a61e8e8ee6c29e262de76312e1bcbc2
parentc319e449549a515c2179393557d1cadb7e75d557
Merge branch 'MDL-52312_master' of git://github.com/markn86/moodle