Merge branch 'MDL-29835_master' of git://github.com/pauln/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:41:13 +0000 (12:41 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:41:13 +0000 (12:41 +0800)

Trivial merge