Merge branch 'wip-MDL-36277-master' of git://github.com/barbararamiro/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 06:58:49 +0000 (14:58 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 06:58:49 +0000 (14:58 +0800)
commit90a23f067ce7f5de17fbac217efe25d75dc1f3b8
tree5b6941ef0bf44c153edb98efc0eb2ea324d0fcbe
parenta353088f2c5395eef79b62d67683d72f1680826a
parent2df53c3ed8bbec175b2b11834090a12fb28ecf5d
Merge branch 'wip-MDL-36277-master' of git://github.com/barbararamiro/moodle

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