Merge branch 'wip-MDL-37085-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 15 Jan 2013 03:30:36 +0000 (16:30 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 15 Jan 2013 03:30:36 +0000 (16:30 +1300)
commitc8d3475e171cd8a6f62e2157906f9ca4e1f66ecd
tree1c24c01624e672723c9374063a95fa119a5d1bc0
parent0a9b944a1562111664e47134b348a80e007cf6b2
parent54258889f2eb54d88b48c2f36772a8e02b5a963b
Merge branch 'wip-MDL-37085-master' of git://github.com/marinaglancy/moodle
course/dnduploadlib.php
course/format/renderer.php
course/view.php
course/yui/modchooser/modchooser.js
theme/base/style/core.css