Merge branch 'MDL-34451_23' of git://github.com/merrill-oakland/moodle into MOODLE_23...
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jul 2012 01:22:48 +0000 (09:22 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jul 2012 01:22:48 +0000 (09:22 +0800)

Trivial merge