Merge branch 'MDL-48373' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Dec 2014 15:15:35 +0000 (15:15 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Dec 2014 15:15:35 +0000 (15:15 +0000)
commit512cc4162e2de64565484e2b75bd62c13a436bbd
treef03fab5016a3dab7d9180f0fbbda082942dc7b8a
parentd2c33655b6386b74f46088dd7909a1f14383c67e
parentdf44db5baaed2ab710a80b3c5963dd14bc6a7ac1
Merge branch 'MDL-48373' of git://github.com/timhunt/moodle