Merge branch 'MDL-31100' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jan 2012 00:02:29 +0000 (01:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jan 2012 00:02:29 +0000 (01:02 +0100)
commitfd684bda5a605a91a3c2d5a70148245b287f93e1
tree003057b91456a8b14a3fe5ed4f2189c8a5e210e7
parentad8c5aee72bd124eb8cbbf6145ca2060627f4779
parentaad1b6ee64e3cb460b30737c223be960e353d295
Merge branch 'MDL-31100' of git://github.com/timhunt/moodle