Merge branch 'w19_MDL-32793_m23_iplookup' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 9 May 2012 02:17:50 +0000 (10:17 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 May 2012 02:17:50 +0000 (10:17 +0800)
1  2 
lang/en/admin.php

Simple merge