Merge branch 'MDL-37858_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 02:33:50 +0000 (10:33 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 02:33:50 +0000 (10:33 +0800)

Trivial merge