Merge branch 'MDL-49754-master' of https://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Apr 2016 13:13:51 +0000 (14:13 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Apr 2016 13:13:51 +0000 (14:13 +0100)
commitf60e024fdc2c560cccafc82cb728e704d687cd25
treeeee8f6849a0fe8891abedcfaf78bf21ca4c77332
parentff72bc88e0a2b063a426bc64882b078f04bd53ae
parent82f5226576c91fac3091e6a8fefde73be78f6fd3
Merge branch 'MDL-49754-master' of https://github.com/xow/moodle