Merge branch 'wip-mdl-30667-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
authorSam Hemelryk <sam@moodle.com>
Wed, 12 Sep 2012 23:18:20 +0000 (11:18 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 12 Sep 2012 23:18:20 +0000 (11:18 +1200)
1  2 
lib/moodlelib.php

Simple merge