Merge branch 'wip-MDL-54962-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 14:15:48 +0000 (16:15 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 14:15:48 +0000 (16:15 +0200)
commit26140adbb9d86d8d171c6877fad13683de80696e
tree249ba3fc42e150d89eb0362275442ccd79ba2109
parent034544ffda012ad950f12400512f9579fb6c7671
parentd58f3a4d2aec812a08bd9812a5debad47aa8a424
Merge branch 'wip-MDL-54962-master' of git://github.com/abgreeve/moodle