Merge branch 'w51_MDL-37299_m25_manselfprogress' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 07:08:05 +0000 (15:08 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 07:08:05 +0000 (15:08 +0800)

Trivial merge