Merge branch 'MDL-27827_head' of git://github.com/grabs/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jun 2011 22:21:58 +0000 (00:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jun 2011 22:21:58 +0000 (00:21 +0200)
commit89ad7c078ed5b7e3022c144df43678281ec02e02
tree720519118297ec9f9409d6611e6bb3ba6894ffaa
parent4965f02087c8f601a5ace3f5dfe6a58f53d2e2f4
parent65ee5d7dad4b199912cbfde9acb915ae3a3f567a
Merge branch 'MDL-27827_head' of git://github.com/grabs/moodle