Merge branch 'MDL-39404' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 08:29:59 +0000 (16:29 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 08:29:59 +0000 (16:29 +0800)

Trivial merge