Merge branch 'MDL-47246_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Dec 2014 13:34:02 +0000 (13:34 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Dec 2014 13:34:02 +0000 (13:34 +0000)
commit051d59e36ee55b9cc1d736277c7aac24954ec405
treecdf8ea2527745031a999e177b74ff327d7f47971
parent29a9a28e57fdca16d17ac3397bf14823c423da23
parentcbebd40dfba711f473761aa187dc6bca749741de
Merge branch 'MDL-47246_master' of git://github.com/dmonllao/moodle