Merge branch 'MDL-50357_29' of git://github.com/markn86/moodle into MOODLE_29_STABLE
commit0cad1c25dc1eaad652c783eea0a6533e28ce2006
authorDan Poltawski <dan@moodle.com>
Wed, 30 Dec 2015 09:19:37 +0000 (30 09:19 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 30 Dec 2015 09:19:37 +0000 (30 09:19 +0000)
treef15c72da73f2d0750b657f6b23cec3e0cb354afe
parent13f89eaf118542ba8e1d81853eebd004e65176fa
parent2d645be2a54f7512a84e2a4c92231db625bbcc2f
Merge branch 'MDL-50357_29' of git://github.com/markn86/moodle into MOODLE_29_STABLE