Merge branch 'MDL-34793' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Aug 2012 05:25:25 +0000 (13:25 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Aug 2012 05:25:25 +0000 (13:25 +0800)

Trivial merge