Merge branch 'MDL-39977' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Jun 2013 02:11:42 +0000 (10:11 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Jun 2013 02:11:42 +0000 (10:11 +0800)
commitc05660fc35c879dbc78ebd55b6b607095f331c59
tree2a75f4218477f4419459670f810b6ae2d7d4bf3c
parent371bf22cc6931c9acfff5e97db6ba6faafe556bb
parent58183f9b01fc613a64e70961fbbbec015b033cda
Merge branch 'MDL-39977' of git://github.com/lazydaisy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
theme/bootstrapbase/style/moodle.css