Merge branch 'MDL-34376' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Aug 2012 02:33:09 +0000 (10:33 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Aug 2012 02:33:09 +0000 (10:33 +0800)

Trivial merge