MDL-22414 Merge branch 'master' into backup-convert
authorDavid Mudrak <david@moodle.com>
Thu, 9 Jun 2011 11:04:49 +0000 (13:04 +0200)
committerDavid Mudrak <david@moodle.com>
Thu, 9 Jun 2011 11:04:49 +0000 (13:04 +0200)
commitb61cf3ff8a3467a9245325f5157c1b20e090c116
treeb037c8fbccfa84f027e7ed7ec517e449d65f3f96
parentfad0f244996bb369d319bee17bc272ae00d15510
parent6911fa130ba58946f952b8a4ba911e3347bf8ac7
MDL-22414 Merge branch 'master' into backup-convert

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