Merge branch 'MDL-34965_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Oct 2012 08:05:43 +0000 (16:05 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Oct 2012 08:05:43 +0000 (16:05 +0800)
1  2 
lib/moodlelib.php

Simple merge