diff --git a/[refs] b/[refs] index 258172745ad3..200124858093 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a28af471b8946de052a0eb0c080d5457be93f168 +refs/heads/master: 3ca1da4a82b169417b738a35783008c35da26466 diff --git a/trunk/CREDITS b/trunk/CREDITS index 35850d882c34..0bf31eac6dc2 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -1127,8 +1127,10 @@ S: Carnegie, Pennsylvania 15106-4304 S: USA N: Philip Gladstone -E: philip@raptor.com +E: philip@gladstonefamily.net D: Kernel / timekeeping stuff +S: Carlisle, MA 01741 +S: USA N: Jan-Benedict Glaw E: jbglaw@lug-owl.de