Merge branch 'MDL-52682-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 25 Jan 2016 07:38:29 +0000 (15:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:17 +0000 (10:15 +0800)
commit99e96d83b6259a8df327ca804a6a98088a043f00
treeb63f43d4fdb6c96149b69d61a59c1703e9d8047e
parent33854a29685b14b4117ab3d20408138ef7fab1c4
parent61937f48f7570d9c4a174677987afe3f9f9477bc
Merge branch 'MDL-52682-master' of git://github.com/andrewnicols/moodle