Merge branch 'MDL-50996' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 25 Aug 2015 06:26:25 +0000 (14:26 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 25 Aug 2015 06:26:25 +0000 (14:26 +0800)
commita2ce97e306806f83e8ae14279ce4ea09ba610c9c
treee1817f960a96b1a4c1692daeed261f60bd1d18f8
parent09fc06d7990e0d3843a09f3c17a7a68c21029d92
parent857e2a6f8caaceaf07153c2bcfa7f63fe0a96a73
Merge branch 'MDL-50996' of git://github.com/timhunt/moodle