Merge branch 'MDL-32824-master-2' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 May 2012 07:21:55 +0000 (15:21 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 May 2012 07:21:55 +0000 (15:21 +0800)
commit786cd60ee3acf126ddae692e0efacb08412aa669
treed35d8eaa3b5a854c588b136e56056268758017ff
parent05d80ae6cd22975c9601d367d1795692b96a3a0e
parent9f3015ecf828a543eb2745b0ba632c4b236f6cbe
Merge branch 'MDL-32824-master-2' of git://git.luns.net.uk/moodle

Conflicts:
course/format/weeks/format.js
course/format/weeks/lib.php
course/format/renderer.php
course/format/weeks/format.js
course/format/weeks/lib.php
course/yui/dragdrop/dragdrop.js