Merge branch 'MDL-37883-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 05:47:37 +0000 (13:47 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 05:47:37 +0000 (13:47 +0800)

Trivial merge