Merge branch 'MDL-31694' of git://github.com/mouneyrac/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 16 Apr 2012 06:27:18 +0000 (14:27 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Apr 2012 06:27:18 +0000 (14:27 +0800)

Trivial merge