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)
1  2 
lib/setup.php

diff --cc lib/setup.php
Simple merge