Merge branch 'MDL-37165-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Dec 2012 03:30:27 +0000 (11:30 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Dec 2012 03:30:27 +0000 (11:30 +0800)

Trivial merge