Merge branch '31830-26' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 7 Oct 2013 07:28:45 +0000 (15:28 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 7 Oct 2013 07:28:45 +0000 (15:28 +0800)
commitd4770c9f0011f35389b9a0ba36ef02f53366fd79
tree5d8cc2fd47aee6fed988913e3d9ea56fd1b9716a
parent4d00df46b19132fa0abae690a4f5ff3bd7569e53
parent7fd307b15300b3ab28c19f9a0a81ec4f806f6413
Merge branch '31830-26' of git://github.com/samhemelryk/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
lib/navigationlib.php
theme/bootstrapbase/style/moodle.css