Merge branch '43365-28' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jun 2014 23:35:17 +0000 (01:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jun 2014 23:35:17 +0000 (01:35 +0200)
commiteaa504cd678e08739349f3e16e6b577905296880
tree0e700dbd99195ec933e053af4db2288a1466b02f
parent8b8c78946fed015e01052ba3dbff6ed83ce538f3
parent78c12cdb0f1160ab57c196a980ee224e7bffc16f
Merge branch '43365-28' of git://github.com/samhemelryk/moodle