Merge branch 'MDL-37046_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Jan 2013 04:03:10 +0000 (12:03 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Jan 2013 04:03:10 +0000 (12:03 +0800)
commit68aaba6c8474602e2db8f136594b7c8841a36b50
treec9e4e30af5d00dfb2b9978c2bdcfb0fc3fb9985e
parent5d80fc80c066ef57379d3d51eb6b75332c1a4062
parent475ac3f8ee9acef370e09f06822227e0501ce94f
Merge branch 'MDL-37046_master' of git://github.com/dmonllao/moodle
lib/setup.php