MDL-26155 admin: Rebased, fixed conflicts, and fixed final admin string
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 20:12:33 +0000 (09:12 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 20:12:33 +0000 (09:12 +1300)
commit2ad2ad0915c890548b3339107af8b51581cf5af3
tree64f6e4b1ad875ebb05e7ee7625d34671e06a160e
parentd79883ab7f4d90881a9302bc02c7e62706dfcd71
MDL-26155 admin: Rebased, fixed conflicts, and fixed final admin string
admin/settings/mnet.php