Merge branch 'MDL-51889_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 29 Dec 2015 07:35:15 +0000 (15:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 29 Dec 2015 07:35:15 +0000 (15:35 +0800)
commitb29c0133097b42d8ee17e11a8b988dc241c142ac
tree9696a055edd21ae8dff91a91b01d0de134b3ac65
parent1c042d38ea6b437b09159be5c61a9fa6e1578225
parentbe6fb6b1a6dccc8acdbf3a0d04bf69380b1bb6cb
Merge branch 'MDL-51889_master' of git://github.com/markn86/moodle