Merge branch 'MDL-34526_master' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 31 Jul 2012 04:57:32 +0000 (16:57 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 31 Jul 2012 04:57:32 +0000 (16:57 +1200)
commit118530e6053872e65743914ee5df1b3e33452efc
treeed0bdb8a05196991629ba529131f8e3d04fea5ae
parent0f78d5c0650eca6daa1c52fa13e58ab1912e493e
parent4543168efba284826c2ea06177321a33842df53b
Merge branch 'MDL-34526_master' of git://github.com/lazydaisy/moodle

Conflicts:
theme/canvas/config.php