Merge branch 'MDL-38808' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 06:46:58 +0000 (14:46 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 3 Apr 2013 06:46:58 +0000 (14:46 +0800)

Trivial merge