Merge branch 'MDL-42551' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 08:21:25 +0000 (16:21 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 08:21:25 +0000 (16:21 +0800)

Trivial merge