Merge branch 'wip-MDL-44168-master' of git://github.com/ds125v/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 07:20:49 +0000 (15:20 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 07:20:49 +0000 (15:20 +0800)
commit28a03399b32ea7b937f10f3c7bc69c7c68303528
tree992235ae143d7d556ad18cf0c9dd506acf279bbf
parent956c7f2c397830e7552016bf647438ca0cfab6a0
parenta0b767e7416fc3fa51cadb9c79d743b9e1665bdb
Merge branch 'wip-MDL-44168-master' of git://github.com/ds125v/moodle

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