Merge branch 'MDL-39415-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Apr 2013 07:34:16 +0000 (08:34 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Apr 2013 07:34:16 +0000 (08:34 +0100)

Trivial merge