Merge branch 'MDL-27974' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Jun 2011 22:37:13 +0000 (00:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Jun 2011 22:37:13 +0000 (00:37 +0200)
commit4d05c972ead2e82d46cc0a6e0ea8601e16e40893
treea3645834ef46940e4058119239bdd6b7e9738216
parenta2854474ce69c01e2ff7d6d7d8c9d20dbbf711d2
parent3c78184552e3f7b2a99a9b89ad437a6dd9e77c06
Merge branch 'MDL-27974' of git://github.com/timhunt/moodle