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)
commit81bfb046afb449fcdbce5d4e560452692ef4d81e
tree0a7991da1a7586fb9aa9437c52d42d69c80d110f
parent24a3115cafff0059bb341ae156ee0d5c8cad1e11
parent12fc11e78f097068f9b367fd929696a7db83e056
Merge branch 'MDL-34965_master' of git://github.com/dmonllao/moodle
lib/moodlelib.php