Merge branch 'wip-MDL-31789-master' of git://github.com/marinaglancy/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 3 Apr 2012 08:31:53 +0000 (16:31 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 3 Apr 2012 08:31:53 +0000 (16:31 +0800)
1  2 
lib/moodlelib.php

Simple merge