Merge branch '44193-27' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Feb 2014 00:00:32 +0000 (01:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Feb 2014 00:00:32 +0000 (01:00 +0100)
commit52c5fb1c0f898e9317cef97e0f8bb14f0708e16f
treece44b78a6efbd1eba3d753c8fa45280c4785ee1e
parentb9b38ea79127b804c1b86374b18abf7e5526f384
parentb4f32f3d3b7b62cee661fdd3c19078194f333766
Merge branch '44193-27' of git://github.com/samhemelryk/moodle