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)
Conflicts:
theme/bootstrapbase/style/moodle.css

1  2 
mod/data/lib.php
mod/data/templates.php
mod/data/view.php
mod/forum/post.php

Simple merge
Simple merge
Simple merge
Simple merge