Merge branch 'MDL-37746' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 02:17:36 +0000 (10:17 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 02:17:36 +0000 (10:17 +0800)

Trivial merge