Merge branch 'MDL-50710-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Dec 2015 03:40:46 +0000 (11:40 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 17:50:02 +0000 (18:50 +0100)
commit76bcec2cb1065313ed3e9018325340258cdc5a99
tree004e30cd8bf652dfd45474fd2c50889ed67d4e7e
parent935b954b5bb29d12f055fbc24ee3a9954d2dac0c
parentf7ff14a1be04531a90ebbcf9fba7ee7bd2c1a49d
Merge branch 'MDL-50710-master' of git://github.com/marinaglancy/moodle