Merge branch 'MDL-55163-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 18 Jul 2016 17:42:46 +0000 (19:42 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 Jul 2016 17:42:46 +0000 (19:42 +0200)
commit90f3675d9c85febf5330bb07bba226138bc8e891
tree69b27d3baa1c9152624f1757bc970997eaf4d8bf
parentae76b9ed17979ee2e3249629b9c82cb32be8313d
parent95624eef0961d914ee198568d6acafd9343eb86b
Merge branch 'MDL-55163-master' of git://github.com/jleyva/moodle