Merge branch 'MDL-53865-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 Apr 2016 01:38:33 +0000 (09:38 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 26 Apr 2016 01:38:33 +0000 (09:38 +0800)
commit1ef42d5f29f3ecc374fa2e2e39b32bf18e078798
tree5d17236821fb400a9508a6d46cfb46f3e863a68c
parent7064aaa11e749190c7af0941c9ce56c3525879f2
parent00456f0bed788a69829568a411cce644871acaf1
Merge branch 'MDL-53865-master' of git://github.com/junpataleta/moodle