Merge branch 'MDL-37886_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 01:43:50 +0000 (09:43 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 01:43:50 +0000 (09:43 +0800)

Trivial merge