Merge branch 'MDL-26332' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 17:26:33 +0000 (18:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 17:26:33 +0000 (18:26 +0100)
commit68e05ea6e66ccda10c669fe734ef489830e159af
tree4dc5ccfee05f631bf2748581f007a63cbd27c33e
parent69c53045ba7131306f3cfba9cc8194fec37d0873
parentb729648032e8bdd997fdf59ed70231f37256ddb3
Merge branch 'MDL-26332' of git://github.com/timhunt/moodle