Merge branch 'MDL-37049_22' of git://github.com/jamiepratt/moodle into MOODLE_22_STABLE
commitd613d7d78e5f50ca49b134573707624c426f4347
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Dec 2011 02:05:42 +0000 (19 15:05 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Dec 2011 02:05:42 +0000 (19 15:05 +1300)
tree07b97ef2d25c7fd099b0fd81811ee068eb42e300
parent7c19940ca6843bf004e79f47b6901dd99716d074
parent9abb69aacb5b3d5cc1e048200e9ecff9f6613c56
Merge branch 'MDL-37049_22' of git://github.com/jamiepratt/moodle into MOODLE_22_STABLE
question/type/questiontypebase.php