Merge branch 'MDL-30873' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jan 2012 19:16:02 +0000 (20:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jan 2012 19:16:02 +0000 (20:16 +0100)
commit2a297e537d527a3d26e3f02ef18232e63f07c36b
treeb17a1034afbb489e7620bd9a1d86b80c622480f9
parentae95489d682726e33c5ee3ac63d8d5037a4f108b
parentce70117bba06b50152108779790970fbdfac34c8
Merge branch 'MDL-30873' of git://github.com/timhunt/moodle