Merge branch 'wip-MDL-32326-m23' of git://github.com/samhemelryk/moodle into MOODLE_2...
authorDan Poltawski <dan@moodle.com>
Tue, 30 Oct 2012 05:40:33 +0000 (13:40 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Oct 2012 05:40:33 +0000 (13:40 +0800)
1  2 
blocks/dock.js

diff --cc blocks/dock.js
Simple merge