Merge branch 'MDL-31622-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE
commit49b48423251a4503c5be7e822a57eaabf283303e
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jul 2012 03:34:29 +0000 (16 11:34 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jul 2012 03:34:29 +0000 (16 11:34 +0800)
treeba3add96f6594b1ce44063089fec76d564b5a54a
parent091c72538242e73f745549cab49d9a7f22821efc
parentb1aa16a30e711aa45ea9adb073759aac0d1426ab
Merge branch 'MDL-31622-22' of git://github.com/FMCorz/moodle into MOODLE_22_STABLE