Merge branch 'MDL-49315' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 11 Mar 2015 00:28:02 +0000 (08:28 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 11 Mar 2015 00:28:02 +0000 (08:28 +0800)
commit43e15173ddcda8959da670216af7a7fd4005755f
treedc87e55bb92b2f0554d2a64d3d9330dd6f4481f4
parent7f7fd7e1e2d97c46ec8ab544de962d35a1b9a25a
parent097efe9de32c9e4ee57585256539d827a07fda5a
Merge branch 'MDL-49315' of git://github.com/timhunt/moodle