Merge branch 'wip-MDL-30222-m20' of git://github.com/samhemelryk/moodle into MOODLE_2...
commit8f51baa885a409b776477444288ed513e77816bb
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Dec 2011 23:40:33 +0000 (8 00:40 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Dec 2011 23:40:33 +0000 (8 00:40 +0100)
tree57b180383163c382c90d07dd6f6c78a280aeb2d5
parent88ade60cf4d92d08e26036158bdfaae39aab8c3d
parentc21932e739ec90e9397846bea3fa5a095d5e651c
Merge branch 'wip-MDL-30222-m20' of git://github.com/samhemelryk/moodle into MOODLE_20_STABLE