Merge branch 'w51_MDL-37152_m25_smtp' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jan 2013 17:01:43 +0000 (18:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jan 2013 17:01:43 +0000 (18:01 +0100)
1  2 
lib/moodlelib.php

Simple merge