Merge branch 'MDL-49368' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Jun 2015 11:14:35 +0000 (12:14 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Jun 2015 11:14:35 +0000 (12:14 +0100)
commit28887344d638ae966fe01e78dcc99498be8f1b97
tree610712761ba22381d3ab0225a1681da0878e1b61
parent846dade5ab7f9096ae262a27fbc9768ae93a7174
parentce95661817e5d243b010eaca7aeadb54748e8d73
Merge branch 'MDL-49368' of git://github.com/timhunt/moodle