Merge branch 'MDL-36223-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 May 2013 14:28:05 +0000 (15:28 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 May 2013 14:28:05 +0000 (15:28 +0100)

Trivial merge