Merge branch 'MDL-30069_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit1e7732cec6654056a06764077d7ef4fa77326c27
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:45:28 +0000 (17 00:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:45:28 +0000 (17 00:45 +0100)
tree1b682495358f29a253e9408aec5f300477f55a2b
parent372d9df6506e432f700d0a820d9e91ec7b505591
parent195a8b78403e16484afc9af337ac59d5d779f729
Merge branch 'MDL-30069_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE