Merge branch 'MDL-37114' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Dec 2012 07:25:22 +0000 (15:25 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Dec 2012 07:25:22 +0000 (15:25 +0800)

Trivial merge