Merge branch 'MDL-31335_mtrace_email' of git://github.com/andyjdavis/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 28 Feb 2012 06:15:28 +0000 (14:15 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 28 Feb 2012 06:15:28 +0000 (14:15 +0800)
1  2 
lib/moodlelib.php

Simple merge