Merge branch 'MDL-32879' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 May 2012 02:49:12 +0000 (14:49 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 May 2012 02:49:12 +0000 (14:49 +1200)
commitbb0eaec4907f92215e6b5005b81c74a52767cf67
tree2fb9790d35e42038041efe96fe098f623c224ddd
parent9757d47ebfd99837fda620aa22c1107986032e6b
parent96e0e914ce57a966f271a7ba1255611bb7ea0ae5
Merge branch 'MDL-32879' of git://github.com/lazydaisy/moodle

Conflicts:
theme/magazine/config.php
theme/afterburner/config.php
theme/arialist/config.php
theme/base/config.php
theme/formal_white/config.php
theme/magazine/config.php