Merge branch 'wip-MDL-42098-master' of git://github.com/abgreeve/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 9 Oct 2013 03:48:14 +0000 (11:48 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 9 Oct 2013 03:48:14 +0000 (11:48 +0800)
commit604fc45ee0baad885f7126f7d5451f4126feb12e
treea0c2580c6cbfde23be6c73a760ba18688fd724fc
parentd00b3f19b9e8cf726b49cc4e9df9cbb1c0974d11
parent94b1577a5ad9c2c85f8c90d230623346b44a2bba
Merge branch 'wip-MDL-42098-master' of git://github.com/abgreeve/moodle
lib/moodlelib.php