Merge branch 'MDL-48634_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 15 Feb 2016 04:20:59 +0000 (12:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 15 Feb 2016 04:20:59 +0000 (12:20 +0800)
commit85dc424a7c4c6d27d8b851f863aa24a5799b81ea
treeea6eed80720b97fff76e13e88088d82b097075db
parent75debb4dbb589fbc0c7b1cf81de20602faa29b9c
parenta3dd8be7dc2b31a8b78925803048d8b5d07996a4
Merge branch 'MDL-48634_master' of git://github.com/markn86/moodle