From: Sam Hemelryk Date: Mon, 26 Sep 2011 01:03:54 +0000 (+1300) Subject: Merge branch 'MDL-29428' of git://github.com/timhunt/moodle X-Git-Tag: v2.2.0-beta~320 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=32da08a2e269118a47350fe256d263af83859373 Merge branch 'MDL-29428' of git://github.com/timhunt/moodle --- 32da08a2e269118a47350fe256d263af83859373