Merge branch 'master_MDL-36168' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 04:38:23 +0000 (12:38 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 04:38:23 +0000 (12:38 +0800)

Trivial merge