Merge branch 'MDL-29339_b' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2011 23:53:51 +0000 (01:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2011 23:53:51 +0000 (01:53 +0200)
commit9bfe68bff8e2bc20dbca5d57bfe1ebf0259b52b1
tree4977dc628ddbec1bfa33a9a11c246f65b3747ae0
parentdc83f5b0060d5b12f379a42752d6e642c798962e
parentdeef04a44e49e610e100462cba2f3ac524966e5d
Merge branch 'MDL-29339_b' of git://github.com/timhunt/moodle