Merge branch 'MDL-34543_m23' of git://github.com/merrill-oakland/moodle into MOODLE_2...
authorDan Poltawski <dan@moodle.com>
Mon, 13 Aug 2012 02:03:47 +0000 (10:03 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Aug 2012 02:03:47 +0000 (10:03 +0800)

Trivial merge