Merge branch 'MDL-39579-master-int' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 May 2013 12:09:14 +0000 (13:09 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 13 May 2013 12:09:14 +0000 (13:09 +0100)

Trivial merge