Merge branch 'MDL-38009_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 03:34:07 +0000 (11:34 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Feb 2013 03:34:07 +0000 (11:34 +0800)

Trivial merge