Merge branch 'MDL-38505' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 26 Aug 2013 09:47:05 +0000 (17:47 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 26 Aug 2013 09:47:05 +0000 (17:47 +0800)

Trivial merge