Merge branch 'MDL-29905-30' of git://github.com/FMCorz/moodle into MOODLE_30_STABLE
commit086b3f25a0ce6d484831ff3beced0c76a1fdc609
authorDavid Monllao <davidm@moodle.com>
Mon, 30 May 2016 07:41:29 +0000 (30 15:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 May 2016 07:41:29 +0000 (30 15:41 +0800)
treecd0eeb4ad760dcca3ad6846d60d889d180b22503
parent932e53d839ed3c634323f968f51ec0314df2d6f9
parent5bc25db29cc7ac6421a896920fb1d842f6ace8e7
Merge branch 'MDL-29905-30' of git://github.com/FMCorz/moodle into MOODLE_30_STABLE