Merge branch 'MDL-35074_master_2' of git://github.com/pauln/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 02:07:43 +0000 (10:07 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 02:07:43 +0000 (10:07 +0800)

Trivial merge