Merge branch 'MDL-52487_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Dec 2015 09:23:03 +0000 (09:23 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Dec 2015 09:23:03 +0000 (09:23 +0000)
commite42b60351eca413e037db4afa221df28468c8d1a
treebfcbafbfa13374d13eebed3471fcce5daffcc5fe
parentb12b03de850b526c776d4efa60c27b727eddf286
parentabc4e1efedd909c9a7090ed17139b57758122eb9
Merge branch 'MDL-52487_master' of git://github.com/dmonllao/moodle