Merge branch 'w28_MDL-28345_m22_utf8' of git://github.com/skodak/moodle
authorSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 11:16:43 +0000 (21:16 +1000)
committerSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 11:16:43 +0000 (21:16 +1000)
1  2 
lib/formslib.php
lib/weblib.php
login/index.php

Simple merge
diff --cc lib/weblib.php
Simple merge
diff --cc login/index.php
Simple merge