Merge branch 'wip-MDL-39299-master' of git://github.com/phalacee/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 16 Jul 2013 12:59:41 +0000 (20:59 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 16 Jul 2013 12:59:41 +0000 (20:59 +0800)
commite202521f2534684275ac50b22a6ccf8fa293b809
treec3f724121c357e4b9e8fdfcf0caa063bf4c81cea
parent5b0804c4b19200088e293e7817fa4583da21f4fb
parentc604e01c138ff79a0517358584100490d01620e2
Merge branch 'wip-MDL-39299-master' of git://github.com/phalacee/moodle

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