Merge branch 'w51_MDL-37152_m23_smtp' of git://github.com/skodak/moodle into MOODLE_2...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jan 2013 17:02:51 +0000 (18:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jan 2013 17:02:51 +0000 (18:02 +0100)

Trivial merge