Merge branch 'wip-MDL-38162-m25' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Feb 2013 00:28:56 +0000 (01:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Feb 2013 00:28:56 +0000 (01:28 +0100)

Trivial merge