Merge branch 'WIP-MDL-35708-M23_quiz' of git://github.com/nadavkav/moodle into MOODLE...
authorDan Poltawski <dan@moodle.com>
Tue, 2 Oct 2012 03:36:56 +0000 (11:36 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Oct 2012 03:36:56 +0000 (11:36 +0800)

Trivial merge