Merge branch 'wip-MDL-38163-m25' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Feb 2013 07:39:30 +0000 (15:39 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Feb 2013 07:39:30 +0000 (15:39 +0800)
1  2 
lib/moodlelib.php

Simple merge