Merge branch 'w02_MDL-29596_m25_editauth' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:43:59 +0000 (12:43 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:43:59 +0000 (12:43 +0800)

Trivial merge