Merge branch 'MDL-51514_m29' of git://github.com/markn86/moodle into MOODLE_29_STABLE
commitd4b743890cbbf695e4149d0c7c203b60404073a6
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Oct 2015 08:00:01 +0000 (5 16:00 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Oct 2015 08:00:01 +0000 (5 16:00 +0800)
treef65309aee13efa6828cf653d0c22fa85d2a30ced
parentad81b49f4a73840696cd5242e1334dc9a6d57853
parentcf945e8ffb65311f061710cfe1bec86186027ce7
Merge branch 'MDL-51514_m29' of git://github.com/markn86/moodle into MOODLE_29_STABLE