Merge branch 'MDL-51147' of git://github.com/timhunt/moodle
commitd4218943d86f2941ee0a32c95a691c58e7685a1f
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 02:07:55 +0000 (15 10:07 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 02:07:55 +0000 (15 10:07 +0800)
treea10052b68cedf9923f9cfd229ce149d09c09eed7
parent9ff2a265d01f62a2d78e0cbd7a25065957645152
parent53eee12a7a9787baa6b9c1700a8cae54222dee56
Merge branch 'MDL-51147' of git://github.com/timhunt/moodle