Merge branch 'w28_MDL-23344_m22_loginfocus2' of git://github.com/skodak/moodle
authorSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 10:25:43 +0000 (20:25 +1000)
committerSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 10:25:43 +0000 (20:25 +1000)
commitc5fe313c0689f207004a22286c061c15072c60ae
treeef30ecd6b3dcf941669c00037b6c92170936783f
parentce4a587308f84e885e67b668777f2bc9ef9e2dd8
parent2d16dad0e1b3008e44aed0ad3ef1f336b23f69ab
Merge branch 'w28_MDL-23344_m22_loginfocus2' of git://github.com/skodak/moodle
lang/en/admin.php
lib/javascript-static.js