Merge branch 'wip-MDL-38708-master' of git://github.com/marinaglancy/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 4 Apr 2013 07:07:01 +0000 (15:07 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 4 Apr 2013 07:07:01 +0000 (15:07 +0800)
commit37240ce5c6f4e1dc23708a6f6e7752a78f961cef
treecb4edeaa12c0bfec604b0cbf222ee1306aaf56e5
parent6ed18a6828de67fa317d647a51f11e4216a8a247
parentd1f8c1bd628f49957e7dddba966b7676db55bef6
Merge branch 'wip-MDL-38708-master' of git://github.com/marinaglancy/moodle

Conflicts:
version.php
course/edit_form.php
course/lib.php
course/renderer.php
lang/en/moodle.php
lib/filelib.php
theme/magazine/style/core.css
theme/splash/style/core.css
version.php