Merge branch 'MDL-39270-master-int' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Apr 2013 15:13:48 +0000 (16:13 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Apr 2013 15:13:48 +0000 (16:13 +0100)

Trivial merge