Merge branch 'w51_MDL-35685_m25_capinit_b' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 06:50:29 +0000 (14:50 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Jan 2013 06:50:29 +0000 (14:50 +0800)

Trivial merge