Merge branch 'MDL-39338_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 08:06:22 +0000 (16:06 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Jun 2013 08:06:22 +0000 (16:06 +0800)
commitc6898e629b4fb267eaaf609c59c6f891f22d5268
treef74c83b9b57979536b754120747b7032378e9c90
parent0a006517e5620f32e8a22fddcb43103992e5b134
parentf84ad1bb0aa5681317e50c6d2106925f8ab1c23a
Merge branch 'MDL-39338_master' of git://github.com/lazydaisy/moodle

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