Merge branch 'MDL-39773_b' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 12 Jun 2013 01:33:23 +0000 (09:33 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 12 Jun 2013 01:33:23 +0000 (09:33 +0800)
commit1899145c5014913959ad207f119003d4788b6aba
treef4ae08cc4131fe5ad6a4267e7de2000f6563fd37
parent44df0d9aaa8e4905af73a24c28bdcd566461ea4c
parent01a9646138655ba6dd5c04eac9d8ef635ce25f1d
Merge branch 'MDL-39773_b' of git://github.com/rwijaya/moodle

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