Merge branch 'MDL-57090-master' of git://github.com/ankitagarwal/moodle
commitc5a5f26ce2aadd0a4629a36924e27f8b254334f4
authorDavid Monllao <davidm@moodle.com>
Wed, 30 Nov 2016 02:43:16 +0000 (30 10:43 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 30 Nov 2016 02:43:16 +0000 (30 10:43 +0800)
tree95d00faa20ea1cf19e7f2b268f7fe035d1a36dbf
parent70f0e8353d12a64ba982a59566ea58944e9939c0
parent3d1be6775242b4c07bd72329848664f28b2f4428
Merge branch 'MDL-57090-master' of git://github.com/ankitagarwal/moodle