diff --git a/[refs] b/[refs] index cdc9de70d5b7..9e9af9d0bd34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5dea5176e5c32ef9f0d1a41d28427b3bf6881b3a +refs/heads/master: fed3be9bd56e67c9b9324277b7f95c32e73a75bb diff --git a/trunk/CREDITS b/trunk/CREDITS index 787564bc248b..6f50be37fa0f 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -1194,15 +1194,9 @@ S: Brecksville, OH 44141-1334 S: USA N: Tristan Greaves -E: Tristan.Greaves@icl.com -E: tmg296@ecs.soton.ac.uk -W: http://www.ecs.soton.ac.uk/~tmg296 +E: tristan@extricate.org +W: http://www.extricate.org/ D: Miscellaneous ipv4 sysctl patches -S: 15 Little Mead -S: Denmead -S: Hampshire -S: PO7 6HS -S: United Kingdom N: Michael A. Griffith E: grif@cs.ucr.edu