Merge branch 'MDL-36775-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 05:10:27 +0000 (13:10 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 05:10:27 +0000 (13:10 +0800)
commite7705abddebfc458ac40dcaf96a7d09db4450eb1
tree9e64ec4246435137accbcd74dc4af22e1957afde
parent5d6aca6e1ab9a8d510ca9a91b4d6c867f06b8d67
parent857c5f90e781682f673edd3406a17dfa2f58d02a
Merge branch 'MDL-36775-master' of git://github.com/FMCorz/moodle

Conflicts:
theme/upgrade.txt
theme/base/style/blocks.css
theme/upgrade.txt