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)
commite5214ea13bda09fa50be52b199bfb81125e3b96c
tree571a4a3cdb3240581bfd5239797116049cdb048d
parent86e62f92231d5148c45405076d605e3888e46524
parent8c6136a87913cb2e6e4b085629f3ce7758a049d6
Merge branch 'w19_MDL-32793_m23_iplookup' of git://github.com/skodak/moodle
lang/en/admin.php