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)
commitf5ba8b0f03cb7cf98e6c799c85fe3af39c17eec5
tree24db7b670d0510246765d16393b014102e7f976a
parent447e59a1f289a8f8feb4281b75fe45d8d0ed7adb
parent1764cd8e6f710f556200c46707f9ed7eec217dc8
Merge branch 'w03_MDL-37593_m25_httpslogineditor' of git://github.com/skodak/moodle