Merge branch 'wip-MDL-30979-m23' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2012 10:38:20 +0000 (11:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2012 10:38:20 +0000 (11:38 +0100)
commita0fbb0a270d39a14d4fb2d5a3f1060fd6ca571aa
treea14559037da869aef1b2cf2242e85775c15dc569
parent47e599785130575f4c53a6f7c540c5bf0a04697e
parentf8129210d231e718238410c18443303ec0c961a1
Merge branch 'wip-MDL-30979-m23' of git://github.com/samhemelryk/moodle