Merge branch 'wip-MDL-35260-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Nov 2012 03:04:23 +0000 (11:04 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Nov 2012 03:04:23 +0000 (11:04 +0800)
1  2 
lib/moodlelib.php

Simple merge