Merge branch 'MDL-34363_m23' of git://github.com/merrill-oakland/moodle into MOODLE_2...
authorDan Poltawski <dan@moodle.com>
Mon, 29 Oct 2012 07:21:48 +0000 (15:21 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Oct 2012 07:21:48 +0000 (15:21 +0800)

Trivial merge