Merge branch 'MDL-28604_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit6b4422a086a0df52e746f6cfd412bfc0db22c99d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Aug 2011 07:42:59 +0000 (9 09:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Aug 2011 07:42:59 +0000 (9 09:42 +0200)
tree4bd6699e55142cdf1254f1e4938fa63ef2b1adc4
parent1c106106fde8fd48c5df1f09e47311331b0b0f02
parent3e1d47f2cc91887b8a0fb32e470b0620d7f41238
Merge branch 'MDL-28604_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE