Merge branch 'MDL-50999-master' of git://github.com/andrewnicols/moodle
commiteb41f5539e7f103915e4384b02c755f237031d92
authorDavid Monllao <davidm@moodle.com>
Tue, 1 Sep 2015 06:35:18 +0000 (1 14:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 1 Sep 2015 06:35:18 +0000 (1 14:35 +0800)
tree4df8d0a8b6980f566456e540a8f57c7692114da7
parent45cd3f6033cbf9932ac801801df76a3efe757acb
parente3554c1c57608e936d7a4af2b4e75d53f20b6194
Merge branch 'MDL-50999-master' of git://github.com/andrewnicols/moodle