Merge branch 'MDL-43076-master' of git://github.com/phalacee/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 05:18:47 +0000 (13:18 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 05:18:47 +0000 (13:18 +0800)
commit6b8c6278bc8155f883e0b62db95d1e42d36f59d9
tree7ec1683fc09b0ea86c8f7f5c69f4691dcdd90290
parente7af63633efd467423851954d443eff85ffb260a
parent7d4e3575bcb1dd893ec9ed743fc0ceaadb9493cf
Merge branch 'MDL-43076-master' of git://github.com/phalacee/moodle

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