Merge branch 'MDL-42919-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 3 Dec 2013 20:43:43 +0000 (09:43 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 3 Dec 2013 20:43:43 +0000 (09:43 +1300)
commitdb9c8f4c7d6b1a970990a2c1f334f573bf85764c
tree4b81c47e25a24534006d00b9fc0d7a3fa5dd3377
parent7b583eea956cbf5168a74b9205b47c99d9d5527c
parent6d55d0f5f0a2f5a33963cfa3a0d51287624d0f53
Merge branch 'MDL-42919-master' of git://github.com/damyon/moodle
lib/formslib.php
theme/base/style/core.css
theme/bootstrapbase/style/moodle.css