Merge branch 'MDL-54609-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 20 May 2016 01:22:07 +0000 (09:22 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 20 May 2016 01:22:07 +0000 (09:22 +0800)
commit3d562d19b9e0c6bfcdf786512a29a1a35b182ec9
tree1532330b54729556b04215d580440a749095c742
parent2a1400b1b864282e2692185f158d97bc5cee8ecf
parentd4b91dab8a3ebe60ad87bf763e1a9574fadcc197
Merge branch 'MDL-54609-master' of git://github.com/junpataleta/moodle