Merge branch 'MDL-39476-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 3 May 2013 15:05:41 +0000 (16:05 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 3 May 2013 15:05:41 +0000 (16:05 +0100)

Trivial merge