Merge branch 'MDL-40515' of git://github.com/aolley/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 04:10:39 +0000 (12:10 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 04:10:39 +0000 (12:10 +0800)

Trivial merge