Merge branch 'wip-MDL-54962-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE
commit16d219ac90a6e4f20489086d935a39d0c41ea833
authorDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 14:16:07 +0000 (11 16:16 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 14:16:07 +0000 (11 16:16 +0200)
tree3580a39c3d553b6723e4b5c26718c0da278fad84
parent069cc7b961b8bcb63f84ba5f2dd905df5f873ccf
parente0bf071213781c24ddd6ee76eb1434b0d77fd831
Merge branch 'wip-MDL-54962-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE