Merge branch 'MDL-52813-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 08:37:57 +0000 (16:37 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 08:37:57 +0000 (16:37 +0800)
commit2569face4e58bcd4e5a0409d99a2ba548d3f21fe
tree3619c3ec23777aa7a7a08681ab2a74f1ca6bbe64
parente372bb043e6bb9643a366f87fa92802a097aeca5
parent4c08658a23945fc1eee7e0f5b7644ad622252967
Merge branch 'MDL-52813-master' of git://github.com/jleyva/moodle