Merge branch 'MDL-36302-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 06:09:56 +0000 (14:09 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 06:09:56 +0000 (14:09 +0800)

Trivial merge