Merge branch 'MDL-51720-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Nov 2015 18:28:41 +0000 (19:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Nov 2015 18:28:41 +0000 (19:28 +0100)
commitd18a8d716c67b97922434145e3f6470ebb3f7860
tree5a1c8bc232409cc1dd9d2891782a8aa1750140e1
parent13cad25081a0242d9f3ffd3f7d2e4e01307922a7
parent85d0696dfa6333553fb990809c51011188457a03
Merge branch 'MDL-51720-master' of git://github.com/damyon/moodle