Merge branch 'MDL-35158-master' of git://github.com/grabs/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 04:28:49 +0000 (12:28 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 04:28:49 +0000 (12:28 +0800)

Trivial merge