Merge branch 'wip-mdl-30667' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 12 Sep 2012 23:19:30 +0000 (11:19 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 12 Sep 2012 23:19:30 +0000 (11:19 +1200)
1  2 
admin/settings/courses.php
lib/moodlelib.php

Simple merge
Simple merge