Merge branch 'wip-MDL-40838-master-2' of git://github.com/marinaglancy/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 21 Feb 2017 08:30:31 +0000 (09:30 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 21 Feb 2017 08:30:31 +0000 (09:30 +0100)
commit73eceea93fab33729d54efcbc69dd52ec7674d3c
tree185bc5e963fb091a1503f1bbf4ce59532d41b491
parentb98b37c670e78f23b43e7f201aa8f414a32dbd98
parent92253b15b7a922e2054e4356fa909ef1a078cba1
Merge branch 'wip-MDL-40838-master-2' of git://github.com/marinaglancy/moodle