Merge branch 'MDL-41152-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 02:03:51 +0000 (10:03 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 02:03:51 +0000 (10:03 +0800)
commitfb9360db3aaa0759953ab5250b9c48f553ab18d7
tree3bb3a3a53aa456ef94dd74fabf9625096d16ae19
parentee749e50bef62c56e769cb19b23e438ce4c3c81e
parent138eb08746e7b18297ae04681480126ea4abdf10
Merge branch 'MDL-41152-master' of git://github.com/FMCorz/moodle

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