Merge branch 'MDL-22510-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 26 Mar 2012 22:03:19 +0000 (11:03 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 26 Mar 2012 22:03:19 +0000 (11:03 +1300)
1  2 
lib/moodlelib.php

Simple merge