Merge branch 'w49_MDL-36983_m25_ordertext' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 04:09:10 +0000 (12:09 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 04:09:10 +0000 (12:09 +0800)

Trivial merge