Merge branch 'MDL-28387-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 6 Mar 2012 22:46:42 +0000 (11:46 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 6 Mar 2012 22:46:42 +0000 (11:46 +1300)
1  2 
lib/moodlelib.php

Simple merge