Merge branch 'MDL-52017_m29' of git://github.com/markn86/moodle into MOODLE_29_STABLE
commita53db0ab73d50fa5dfecc03c98d8964defa5c77d
authorDavid Monllao <davidm@moodle.com>
Tue, 22 Dec 2015 08:37:29 +0000 (22 16:37 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 22 Dec 2015 08:37:29 +0000 (22 16:37 +0800)
tree145f0db1a46e3b727e591d2a2781e196729630c2
parente493cb7d9c2b14e877d13aa432d1612f2a4075f3
parent9678041d7d8537ae56c295065820022de6a5e9d4
Merge branch 'MDL-52017_m29' of git://github.com/markn86/moodle into MOODLE_29_STABLE