Merge branch 'MDL-46934-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 May 2016 06:38:01 +0000 (14:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 May 2016 06:38:01 +0000 (14:38 +0800)
commit287074207f24cd793c6ac505bdf4a154722f7d2a
tree9dc2ea45a017ca4fb0eededc1d58569cee0da307
parentec7ade95db7b7e370496a8304de3d3d4db97c2b7
parent4700c44c010f524a22a1297c3842eaee501fad3e
Merge branch 'MDL-46934-master' of git://github.com/FMCorz/moodle