Merge branch 'MDL-50710-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE
commit716c7536cbb777a3300b64847e00c757c9197f4c
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Dec 2015 03:41:16 +0000 (2 11:41 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 18:01:45 +0000 (3 19:01 +0100)
treee74827c85f6c077e43296d749891a513284929f8
parent8dbe8449e0e004b06487f2dd5ca5e096c00615e2
parentcf139e224e87d8781b30f0decaf2e2aec7bda96f
Merge branch 'MDL-50710-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE