Merge branch 'MDL-51759-master-2' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 19 Oct 2015 05:30:17 +0000 (13:30 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 19 Oct 2015 05:30:17 +0000 (13:30 +0800)
commit1ed96351aa73aa4dc20900881e4801fbc0d1d129
tree10f434ee6d98cde9bba4b7aad0786efc8c2807ef
parentc95ba7faa819ee249c98fff9de3166c867119240
parent7108d08dd1e1dce8ff62539591937d3799fb5123
Merge branch 'MDL-51759-master-2' of git://github.com/andrewnicols/moodle