Merge branch 'MDL-56811-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 11 Nov 2016 04:13:30 +0000 (12:13 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 Nov 2016 04:13:30 +0000 (12:13 +0800)
commit3ecf492a75f1087d50d5680002ee31fb15cb4190
tree7e59ed503d61a1f3ff7944be6357e59df18219fe
parent6b7b3e59f2a47bc16eed6152acadd8e4c2e83647
parent16076f1e3da16b0727ea90dbf4117ce2733d25c0
Merge branch 'MDL-56811-master' of git://github.com/damyon/moodle