Merge branch 'MDL-30069' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:45:00 +0000 (00:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:45:00 +0000 (00:45 +0100)
commitd647c2d60884f9109308915dbd4fe9c9fcc8777c
treea0a4b7f4ea0b065c8371f53ffffa104f879cda61
parente929eb035349c7e8ad57ec03cb0b9583ae45e67b
parent5cc021a00b43722379a10fb6905314defeff016e
Merge branch 'MDL-30069' of git://github.com/timhunt/moodle