Merge branch 'w27_MDL-23344_m22_loginfocus' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2011 15:01:58 +0000 (17:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2011 15:01:58 +0000 (17:01 +0200)
1  2 
lib/javascript-static.js
login/index.php

Simple merge
diff --cc login/index.php
Simple merge