Merge branch 'MDL-37789_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 31 Jan 2013 07:34:46 +0000 (15:34 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 31 Jan 2013 07:34:46 +0000 (15:34 +0800)

Trivial merge