Merge branch 'w03_MDL-37593_m25_httpslogineditor' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 04:35:54 +0000 (12:35 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 04:35:54 +0000 (12:35 +0800)

Trivial merge