Merge branch 'MDL-28134_branch' of git://github.com/nebgor/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 10 May 2012 05:44:03 +0000 (13:44 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 10 May 2012 05:44:03 +0000 (13:44 +0800)
commit33886490651281ffe93dae6e59100d97d83c0399
treefbb5163a7a2bcd6132fd495db15e92e9ca377e1f
parentc56d266a587bb48bbb14f41aff5bd84cb97b5c62
parented01233acef5e5025908f14f568d728534f545c3
Merge branch 'MDL-28134_branch' of git://github.com/nebgor/moodle
lib/setuplib.php
version.php