Merge branch 'MDL-33794' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jun 2012 08:08:39 +0000 (16:08 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jun 2012 08:08:39 +0000 (16:08 +0800)
commit3248a1e1e45e173752e161a036f010315ee96832
tree74fecd8a28d27c4bd87f9b00d09e1b6d7af64a9d
parent341d989d636e96a3bf566748bed0ce350eb18c93
parentc5e783e5125d141cbd2973a29fcb73989602c15a
Merge branch 'MDL-33794' of git://github.com/stronk7/moodle

Conflicts:
mod/assign/version.php