Merge branch 'MDL-52208-master-2' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 16 Feb 2016 06:39:46 +0000 (14:39 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 16 Feb 2016 06:39:46 +0000 (14:39 +0800)
commit82e1b645ebbb9d769a7164923bc684b74eb13849
tree58418aaf784e3807b7abbe28db1c8c1f7148eb9b
parentb018aec5dae7f4430a5c976a1e3b69a3fe211222
parent79c7fffce313d31c7e4e7a048c10e83700bce035
Merge branch 'MDL-52208-master-2' of git://github.com/junpataleta/moodle