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

Trivial merge