Merge branch 'MDL-35023_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 14:33:39 +0000 (16:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 14:33:39 +0000 (16:33 +0200)
commit8f93d94ab2ea86ac240d4ec69dcbef2bdc938283
tree794788c8c9ff95efb19a07fae784d832cf55c4b8
parentb6cd7017c090eb8dfdb0d7561073ad38bc4287fc
parent07eca71195b7bd36cbe419f9bf3624abc76a0f26
Merge branch 'MDL-35023_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE