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)
1  2 
theme/bootstrap/config.php

Simple merge