Merge branch 'MDL-51771' of git://github.com/timhunt/moodle
commite54193ed3ead1edea8fa61cf73d11f4c37e14a6b
authorDavid Monllao <davidm@moodle.com>
Mon, 19 Oct 2015 08:27:41 +0000 (19 16:27 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 19 Oct 2015 08:27:41 +0000 (19 16:27 +0800)
treed3ae7fbf82a9b60632df552e40845c1a7a8120ae
parent96a6b6b20b457ae379eb3836b2667b1e822fb162
parente5acdcb9423e95160ad07f5b1a1df10718ae4ecb
Merge branch 'MDL-51771' of git://github.com/timhunt/moodle