Merge branch 'MDL-33980' of github.com:equella/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 03:20:40 +0000 (11:20 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Jun 2012 03:20:40 +0000 (11:20 +0800)

Trivial merge