Merge branch 'wip-MDL-26754-master' of github.com:marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Aug 2011 11:07:54 +0000 (13:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Aug 2011 11:07:54 +0000 (13:07 +0200)

Trivial merge