Merge branch 'wip-MDL-39432-m23' of git://github.com/samhemelryk/moodle into MOODLE_2...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Apr 2013 23:35:24 +0000 (01:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Apr 2013 23:35:24 +0000 (01:35 +0200)

Trivial merge