Tim Hunt 74c479f212 MDL-20636 Merge branch 'master' into qe2_wip
Conflicts:
	lib/questionlib.php
	question/type/calculated/lang/en/qtype_calculated.php
	question/type/questiontype.php
2011-02-03 11:18:40 +00:00
..
2011-01-14 09:32:17 +01:00
2011-01-14 09:32:17 +01:00
2010-09-17 09:57:10 +00:00
2010-08-05 20:14:55 +00:00