Merge branch 'MDL-39514-master' of git://github.com/barbararamiro/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 May 2013 15:32:29 +0000 (16:32 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 May 2013 15:32:29 +0000 (16:32 +0100)

Trivial merge