Merge branch 'MDL-22236-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Aug 2013 05:27:50 +0000 (13:27 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Aug 2013 05:27:50 +0000 (13:27 +0800)

Trivial merge