Merge branch 'MDL-52826_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jan 2016 10:38:14 +0000 (10:38 +0000)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:18 +0000 (10:15 +0800)
commite23c76d72e098e62cd4309e8e4ca6ec11f83aa52
tree1d7f304b0c39eef46cb3f4da352ad8a3d755bf1c
parent1d1c8f6275a55ab6ebc0be05c6dc0e48f338ce26
parent2edb12ec302fc003a46e8f3ca8596e51fdd3c54f
Merge branch 'MDL-52826_master' of git://github.com/dmonllao/moodle