Merge branch 'wip-MDL-28948-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Dec 2011 21:44:41 +0000 (10:44 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Dec 2011 21:44:41 +0000 (10:44 +1300)
commitfc0d8f77f224e02079842a2ae30085550f442989
tree66f2231a5424a42bc042574d43c7c8a0fbfc6abc
parent5e928f2e7ebb2e3199641e51eedf57bf2f209ba9
parent98456628a24bba25d336860d38a45b5a4e3895da
Merge branch 'wip-MDL-28948-master' of git://github.com/abgreeve/moodle
lib/moodlelib.php