Merge branch 'MDL-39683-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 20 Jan 2014 03:27:07 +0000 (11:27 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 20 Jan 2014 03:27:07 +0000 (11:27 +0800)
commit6d7d401711b549a391d418cb55c46b27b3e60add
tree4e02211bfef647be9dfde68f97c5f7cc84afb1c7
parentb34f6f5f5cd1ade960d3eda66c87549017a315f5
parent2fca44ad656f1b0616c8eaa496c401e2c4fc8edb
Merge branch 'MDL-39683-master' of git://github.com/FMCorz/moodle

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