Merge branch 'wip-MDL-36297-m25' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Jan 2013 07:05:15 +0000 (15:05 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Jan 2013 07:05:15 +0000 (15:05 +0800)
commitddaf0983b2938abe14003fd1bf0c6f5c13d8c58f
tree5422fa5e2c8c9312c7d7ccd6a413c857eccf114d
parentbf5f8a4f6013ae1c1e512c8daf3824bc58f32108
parente85c56ccb87f7000f91472e50cb16d4ac0a304a4
Merge branch 'wip-MDL-36297-m25' of git://github.com/samhemelryk/moodle
lib/weblib.php