Merge branch 'MDL-25983_23' of git://github.com/dmonllao/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 05:52:55 +0000 (13:52 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 05:52:55 +0000 (13:52 +0800)

Trivial merge