Merge branch 'MDL-44881-master' of git://github.com/phalacee/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 8 Apr 2014 08:55:49 +0000 (16:55 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 8 Apr 2014 08:55:49 +0000 (16:55 +0800)
commitd175d25adc14cb4a30afda970aa556214fec2922
tree1654ee81959f44f699ccbbf1c5306d7cea59c9f1
parent0610d2ca92363189eb7fe2c99d9d1376c3b25d67
parent0d5bfb9c651febb72ff58b5f104e8ac15ab88fa2
Merge branch 'MDL-44881-master' of git://github.com/phalacee/moodle

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