Merge branch 'MDL-29528_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commitba1afa0d9561c55807451c7052fbb1b0402da89e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Sep 2011 19:44:49 +0000 (26 21:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Sep 2011 19:44:49 +0000 (26 21:44 +0200)
tree5aaa6d428f6a579b7abad3f8400b42b58fcb4e07
parent3cef27bf9f45cab32301ddcfcd2e3e1d26a44c00
parentf8431a1933d634d055a8b8e837b98bc11a826716
Merge branch 'MDL-29528_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE