Merge branch 'MDL-52597-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 29 Dec 2015 02:01:07 +0000 (10:01 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 29 Dec 2015 02:01:07 +0000 (10:01 +0800)
commit3d4837f915256647af9ef3921bc0db545b1aa090
tree686ce50041590618e98214cc72d046617dc3ac70
parent26b9181b1bdc864e44c1d8d5c5fc5a7fa0e9f518
parent6ec766069c7e22279ca35eacb14bbfc774198ff3
Merge branch 'MDL-52597-master' of git://github.com/andrewnicols/moodle