Merge branch 'w28_MDL-28345_m22_utf8' of git://github.com/skodak/moodle

author Sam Hemelryk <sam.hemelryk@gmail.com>

Mon, 18 Jul 2011 11:16:43 +0000 (21:16 +1000)

committer Sam Hemelryk <sam.hemelryk@gmail.com>

Mon, 18 Jul 2011 11:16:43 +0000 (21:16 +1000)
author Sam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 11:16:43 +0000 (21:16 +1000)
committer Sam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 11:16:43 +0000 (21:16 +1000)
diff --cc lib/formslib.php
Simple merge
diff --cc lib/weblib.php
Simple merge
diff --cc login/index.php
Simple merge
author	Sam Hemelryk <sam.hemelryk@gmail.com>
	Mon, 18 Jul 2011 11:16:43 +0000 (21:16 +1000)
committer	Sam Hemelryk <sam.hemelryk@gmail.com>
	Mon, 18 Jul 2011 11:16:43 +0000 (21:16 +1000)
		1	2
lib/formslib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/weblib.php	patch \|	diff1 \|	diff2 \|	blob \| history
login/index.php	patch \|	diff1 \|	diff2 \|	blob \| history