Merge branch 'wip-MDL-40321_master' of git://github.com/gjb2048/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 02:07:07 +0000 (10:07 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 27 Aug 2013 02:07:07 +0000 (10:07 +0800)
commit37bb910633133180d0dcdaacf69d4a4ea4f3df2b
treef16a601b5d1f0e6f71e7c91be557488968efdfc3
parent51eba172e68b14bfa0fbc7ba39eec62d8092b2c9
parent44877c48d00c2dd81f7f2b73c56e6a03ed5d33cf
Merge branch 'wip-MDL-40321_master' of git://github.com/gjb2048/moodle

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