Merge branch 'wip-MDL-31179-master' of github.com:marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jan 2012 00:19:18 +0000 (01:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jan 2012 00:19:18 +0000 (01:19 +0100)

Trivial merge