Merge branch 'MDL-40896' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 19 Aug 2013 07:38:23 +0000 (15:38 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 19 Aug 2013 07:38:23 +0000 (15:38 +0800)
commit26ae471585d43e7af404cf8235d50c84a4865150
treec6eb89432d8d79a2012caae0f72ec0dadc350550
parent5ebe37fb27ab546304926e64411fdf029a854150
parent2f7827b241a8629715c5d4590ed7bf37c923f5e6
Merge branch 'MDL-40896' of git://github.com/timhunt/moodle

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