Merge branch 'MDL-46167-master' of https://github.com/mackensen/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Aug 2015 08:28:06 +0000 (09:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Aug 2015 16:30:28 +0000 (18:30 +0200)
commitcfd9279f3d4ee354e0f316d71bd3da62041dca9f
treecbeecd85f01030211006c7e9af55d7095e900302
parentd2999f8085ffdd8c5eaf30ba5ef40a4581935695
parent096fd59653d33bd6a75e4edd8b86e71e954b149a
Merge branch 'MDL-46167-master' of https://github.com/mackensen/moodle