Merge branch 'MDL-50218-master' of https://github.com/xow/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 06:39:54 +0000 (14:39 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 06:39:54 +0000 (14:39 +0800)
commit3f5c6ff2dea135e314b99268b73f50533dd97184
tree725d22747106912b91d5a808921877d510996d47
parentd5f05f77f383e33afad03ec9b352226eb88b5d00
parente42b23ebe26e08595e1fe70ff474459e4de0bf64
Merge branch 'MDL-50218-master' of https://github.com/xow/moodle