Merge branch 'w31_MDL-17830_m24_zipresult' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 03:22:07 +0000 (11:22 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 03:22:07 +0000 (11:22 +0800)

Trivial merge