Merge branch 'MDL-41227_dd' of https://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 Sep 2013 03:15:53 +0000 (16:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 Sep 2013 03:15:53 +0000 (16:15 +1300)
commit73cc3bdeb0ea4146201506651f22f3d331dcf833
tree49aead04b581bf42001790ebcad33c669a1b892b
parent5e8331c814717c99153c19b0c650c1fbdf1e0a68
parentd0f30b07ce0f290a0cf88d562e8c28bdca3d50a2
Merge branch 'MDL-41227_dd' of https://github.com/andyjdavis/moodle

Conflicts:
course/yui/toolboxes/toolboxes.js
course/yui/toolboxes/toolboxes.js