Merge branch 'wip-MDL-33661-master' of https://github.com/barbararamiro/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Jun 2012 08:28:00 +0000 (16:28 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Jun 2012 08:28:00 +0000 (16:28 +0800)
commit5e3698fda0f0e92a140e2d1fbccf653201b7b557
tree319be7fb574df6cd6b719da0e69f5cb6eb5a617b
parent4214bc63a8842759582ee5b16ed2a6029ddc2e8f
parent64063bdbe2fa81e5f2fc1353c4bae192ce97779e
Merge branch 'wip-MDL-33661-master' of https://github.com/barbararamiro/moodle

Conflicts:
theme/base/style/core.css
theme/base/style/core.css