Merge branch 'MDL-39010_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Apr 2013 07:58:30 +0000 (08:58 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Apr 2013 07:58:30 +0000 (08:58 +0100)
commit118f39de133800022ffceeeedf5d8efb2bb959d7
tree57ac8dc08615d7d8f7c18079bdf4b4f8868e1d31
parenta7eac88f9454259169ad212b976b361d72d639e2
parent15153cf22918bdaec11f4440ed1d180384640abf
Merge branch 'MDL-39010_master' of git://github.com/lazydaisy/moodle
theme/bootstrap/config.php