Merge branch 'MDL-53796_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Apr 2016 23:58:13 +0000 (01:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Apr 2016 23:58:13 +0000 (01:58 +0200)
commit15f69edb1dcc2232f7d8b793636209d34cc17131
treec3cbd0a124239b3bc3273c777c4d016b3953bd07
parent8ac2e53d1728e6e697d27ba430de78bc59ac9e01
parent8918a8115e95e42f25ad3e409094aa6c8b67bbb7
Merge branch 'MDL-53796_master' of git://github.com/dmonllao/moodle