Merge branch 'wip-MDL-55939-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 10 Apr 2017 10:57:34 +0000 (12:57 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 10 Apr 2017 10:57:34 +0000 (12:57 +0200)
commit3c8b8b8262cadb274c246979f3b81adf1c1ef340
treec57c8b9e5af13c292c30bfaa8c5918b2dc2225ab
parentf0ad40d13c8ccec8720483fd14c155cbe4cf040b
parenta0cf7ee8de0aadc6c442cd091bc5a45126d1cc1f
Merge branch 'wip-MDL-55939-master' of git://github.com/marinaglancy/moodle