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)
Conflicts:
theme/base/style/core.css


No differences found