Merge branch 'MDL-36404-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jan 2016 10:24:04 +0000 (10:24 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jan 2016 10:24:04 +0000 (10:24 +0000)
commit26e45019c82e4a0b8fa8942143acd4273b766553
treefa7b6aab0919b6be5713d21715ed486ffde563db
parent45f167bd2ba2d9078d7f0f3999e1d913c2fa1ca8
parente9088e28accd031bb37cbb3f254f287197e9927a
Merge branch 'MDL-36404-master' of git://github.com/junpataleta/moodle