Merge branch 'wip-MDL-31836-m26' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Aug 2013 06:57:23 +0000 (14:57 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Aug 2013 06:57:23 +0000 (14:57 +0800)
1  2 
lib/moodlelib.php

Simple merge