Merge branch 'MDL-51117-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 16 Feb 2016 05:26:37 +0000 (13:26 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 16 Feb 2016 05:26:37 +0000 (13:26 +0800)
commitb018aec5dae7f4430a5c976a1e3b69a3fe211222
treea58977692e5c5c123655caa31f0615c61b7b85e7
parent7fadf9edff57c0b87f3d0f95cc795e23da6feff1
parent296af14b195f625c71068e6c1305ed58722eceaf
Merge branch 'MDL-51117-master' of git://github.com/andrewnicols/moodle