Merge branch 'MDL-38716-master-int' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Apr 2013 06:35:14 +0000 (07:35 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Apr 2013 06:35:14 +0000 (07:35 +0100)

Trivial merge