Merge branch 'MDL-49269-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 11 Mar 2015 00:23:30 +0000 (08:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 11 Mar 2015 00:23:30 +0000 (08:23 +0800)
commit7f7fd7e1e2d97c46ec8ab544de962d35a1b9a25a
tree65c6f66345d03d5cdd751c5c39a2befcf06cf507
parentac28aad3519dbc5f73f1fcdd7f3384d008777f77
parent3acc64e3236d4e1c928c5911f1686c71c4e6765e
Merge branch 'MDL-49269-master' of git://github.com/andrewnicols/moodle