Merge branch 'MDL-33532' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 7 Jun 2012 14:23:38 +0000 (22:23 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 7 Jun 2012 14:23:38 +0000 (22:23 +0800)
1  2 
lib/moodlelib.php

Simple merge