Merge branch 'MDL-55163-30' of git://github.com/jleyva/moodle into MOODLE_30_STABLE
commita4de0bbd5973c29c3b88175c738f07d80939d17d
authorDavid Monllao <davidm@moodle.com>
Mon, 18 Jul 2016 17:45:23 +0000 (18 19:45 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 Jul 2016 17:45:23 +0000 (18 19:45 +0200)
treec89b421c32f08ef417a851f6fbf458dde4548ace
parent87c1a2e7e82096d4dcba736bffde3bd6a6297f84
parent39e110d14530389f0395f8ae828c729c509c6589
Merge branch 'MDL-55163-30' of git://github.com/jleyva/moodle into MOODLE_30_STABLE