Merge branch 'MDL-28099_wip' of git://github.com/jamiepratt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Jun 2011 22:54:35 +0000 (00:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Jun 2011 22:54:35 +0000 (00:54 +0200)

Trivial merge