Merge branch 'MDL-28196' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2011 17:55:31 +0000 (19:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2011 17:55:31 +0000 (19:55 +0200)
commit476ea4f8ce698aa1ad51af847df44531105a5111
tree5a434ae0e8613088094de7e913953b33db0e23c0
parent6ce986e54ccd63509c09d1c9568cac50a3b0065b
parentb149b7885963fa0c87716a241d3327d25dda5f9f
Merge branch 'MDL-28196' of git://github.com/timhunt/moodle