Merge branch 'MDL-40731_headings' of https://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 9 Sep 2013 23:22:04 +0000 (11:22 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 9 Sep 2013 23:22:04 +0000 (11:22 +1200)
commita775f2c96dbb00bdb2e3fa2625fcb348f9b64bb1
tree873ab27e69c0e9b46804baf40e09d9e778b6e731
parentbee0a508ef4d1ac41bcdc3d7cf0564244c8ae82e
parent66e2b9f8c2dde9122a7078b19de069c6051a9917
Merge branch 'MDL-40731_headings' of https://github.com/andyjdavis/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
mod/data/lib.php
mod/data/templates.php
mod/data/view.php
mod/forum/post.php