Merge branch 'MDL-26956' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Apr 2013 11:49:02 +0000 (19:49 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Apr 2013 11:49:02 +0000 (19:49 +0800)
1  2 
lib/formslib.php
theme/base/style/core.css

Simple merge
Simple merge