Merge branch 'MDL-50933' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 25 Aug 2015 06:28:06 +0000 (14:28 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 25 Aug 2015 06:28:06 +0000 (14:28 +0800)
commit7ac0ddd00a72c45820d6ca14b617bf100cf105a5
tree10c92e50644980ca33167e7b8101c42c9a911008
parenta2ce97e306806f83e8ae14279ce4ea09ba610c9c
parent83cd293a107eeaab6545a9995dda447ff5e93ddd
Merge branch 'MDL-50933' of git://github.com/timhunt/moodle