Merge branch 'MDL-50483-29' of git://github.com/lameze/moodle into MOODLE_29_STABLE
commit4dfa85c18b2b0aaec3a786aa349cbdabdbd05cbb
authorDavid Monllao <davidm@moodle.com>
Mon, 19 Oct 2015 09:06:47 +0000 (19 17:06 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 19 Oct 2015 09:06:47 +0000 (19 17:06 +0800)
tree9826aa1bbac4a3aee2b03615b08ae34c52233545
parentca46e9517076814465e3904b9a28bd8d76667be8
parenta0b2d4e707f59123fe5a5ad2c0c18118dfbff41e
Merge branch 'MDL-50483-29' of git://github.com/lameze/moodle into MOODLE_29_STABLE