Merge branch 'MDL-53996-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 2 May 2016 02:51:59 +0000 (10:51 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 2 May 2016 02:51:59 +0000 (10:51 +0800)
commit74995620caa120913d0e5770f402bde2811399f9
tree502725f9b012e549e7574ecabec1afacc0edc015
parentf74e3ace69ee1629fcb648c580947584fcd89549
parent12e649e22889a47f884ccd8db4ae36ed5c562b7c
Merge branch 'MDL-53996-master' of git://github.com/junpataleta/moodle