Merge branch 'MDL-54664-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 May 2016 01:50:44 +0000 (09:50 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 May 2016 01:50:44 +0000 (09:50 +0800)
commit170402cb4ef7452506637dbfa39a381aad21e43c
tree3f42d240d7504e6dfbb9985d2e316f707c530879
parent2eb57cf7a27b6915a88971d79e27f42c4c3117f8
parent16fb3f450523f6abfa1a6b01e1600c0add835230
Merge branch 'MDL-54664-master' of git://github.com/junpataleta/moodle