Merge branch 'MDL-49368_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE
commit90e175670a34911d351e553be77ba3f3895a6a84
authorDan Poltawski <dan@moodle.com>
Mon, 15 Jun 2015 11:33:31 +0000 (15 12:33 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Jun 2015 11:33:31 +0000 (15 12:33 +0100)
tree3bcd9cd47275a58d6b428c5bb5477ed397d3dbc9
parent9b7d060c5ea7b811af27164396de82731cba0579
parent6f1b265a2b6fc8a6ca856d67864dd9f5ee844120
Merge branch 'MDL-49368_28' of git://github.com/timhunt/moodle into MOODLE_28_STABLE