Merge branch 'MDL-36204_master' of git://github.com/pauln/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 04:45:08 +0000 (12:45 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 04:45:08 +0000 (12:45 +0800)

Trivial merge