Merge branch 'MDL-30033' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jan 2012 23:09:12 +0000 (00:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jan 2012 23:09:12 +0000 (00:09 +0100)
commit9bceddfa2b6784f5a77c7d25c563c48b2a997abd
treefe4207e9d0dde3dcddaf23a38bcb1cb757121e42
parent697cd1963b60009a4a34c4d5a071a2dad48cc081
parentb7ab57f3afe25e94564bc5d4def9a499dcd4ee5b
Merge branch 'MDL-30033' of git://github.com/timhunt/moodle