Merge branch 'MDL-50483-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 19 Oct 2015 09:06:03 +0000 (17:06 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 19 Oct 2015 09:06:03 +0000 (17:06 +0800)
commitd80d38a9363747cf8296d2091ae7bd8d465d736b
tree2fbe3fa807bd0abf774c67399fbdb5bcfc282f31
parent563fe0a5692d98815f9c7a09318fd7024af25cc2
parente2ec4f3a125095f1b3a8d8e4248532e78604db3c
Merge branch 'MDL-50483-master' of git://github.com/lameze/moodle