Merge branch '45209-28' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Jul 2014 21:49:58 +0000 (23:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Jul 2014 21:49:58 +0000 (23:49 +0200)
commit6d84726b3a3af93c8f27516bd9f09a4b72855a06
tree11267df34e88aa7f536963077b0bfa5f4173d3c7
parentda6ddbf8e64816275bedfa01411d708140fd9b20
parentb9f4c378799ba449c7896b3b208af14320f305ba
Merge branch '45209-28' of git://github.com/samhemelryk/moodle