Merge branch 'MDL-56826-master-fix1' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 17 Nov 2016 12:25:31 +0000 (20:25 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 17 Nov 2016 12:25:31 +0000 (20:25 +0800)
commite23e6c2f6419753e78211e94d117751316012b21
treec608566b7fcbd56d7c2b570bd2bf44581d859d07
parentf209d76b0d57386f22e666c8f955201eaf7af808
parent009c57d730b036d4cf9baad5fdcf3ae0f8102682
Merge branch 'MDL-56826-master-fix1' of git://github.com/damyon/moodle