Merge branch 'MDL-38681-master-int' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 06:27:08 +0000 (14:27 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 06:27:08 +0000 (14:27 +0800)
1  2 
lib/formslib.php
theme/base/style/core.css

Simple merge
Simple merge