Merge branch 'wip-MDL-53601-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 2 May 2016 08:17:48 +0000 (16:17 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 2 May 2016 08:17:48 +0000 (16:17 +0800)
commit71c0a5745c6faae33eff38c6876acb2fa19c9ea1
tree28596eb586c9d495511708403c4b9cb73cc32436
parent3ec1965570f5fb50d2bcba8dde96ed9bd46b41a0
parent1beb95af48b32b0dd756dfe2e5dfc7e84651d649
Merge branch 'wip-MDL-53601-master' of git://github.com/abgreeve/moodle