Merge branch 'w13_MDL-38589_m25_pear' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 22:14:24 +0000 (23:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 22:14:24 +0000 (23:14 +0100)

Trivial merge