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

Trivial merge