Merge branch 'MDL-30839-25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE
commit31235acf2b38d7c25bdafabe3e361b14f545118b
authorDan Poltawski <dan@moodle.com>
Mon, 19 Aug 2013 09:51:11 +0000 (19 17:51 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Aug 2013 09:51:11 +0000 (19 17:51 +0800)
tree5bbbfe8e902c885554492c8cfc0bb9e0b592ba71
parentc67f7093a4cfe6b3f0dc02c7700ac99054a4fa5d
parent78dd49f5d049f5db2d2dea586e6849056e6c98cc
Merge branch 'MDL-30839-25' of git://github.com/phalacee/moodle into MOODLE_25_STABLE
theme/bootstrapbase/style/moodle.css