Merge branch 'MDL-47726' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Oct 2014 16:26:36 +0000 (17:26 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Oct 2014 16:26:36 +0000 (17:26 +0100)
commit30fac845783b0e0a54dbeb0716237ff4ec4ac373
treeef5f2f236b8becab9e773ca9beec50582beae8cf
parent670b0d0283ca30426ada7955538328421e89575d
parenta3d5068083b465a2ede09f34675dc177379156d0
Merge branch 'MDL-47726' of git://github.com/timhunt/moodle