Merge branch 'wip-MDL-39741-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 1 Jul 2013 01:22:27 +0000 (13:22 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 1 Jul 2013 01:22:27 +0000 (13:22 +1200)
commite962fe0871715aff48a1b4a11e3ca390755a0d6b
tree61e26ee2a5a73f2bff154c3e314d36da33f93776
parent88abda50aabcc798a0fdaf00e2b6ba8388c6807f
parentc3820eda51e421e68a100d5fe0250ef1a38ed970
Merge branch 'wip-MDL-39741-master' of git://github.com/marinaglancy/moodle

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