Merge branch 'MDL-50710-29' of git://github.com/marinaglancy/moodle into MOODLE_29_STABLE
commit3e7d409d721578862cc50a6fd249fcb2c3e9e470
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Dec 2015 03:41:25 +0000 (2 11:41 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 18:03:28 +0000 (3 19:03 +0100)
treeafdcdda5c7070b3555a6ae0577530c0229b04036
parent1a62cb7567806bc7e61647d023b74944f63521d7
parent8d77d104bf6c8806cc065b88e6fcc0b4d35ae6c0
Merge branch 'MDL-50710-29' of git://github.com/marinaglancy/moodle into MOODLE_29_STABLE