diff options
| author | makefu <github@syntax-fehler.de> | 2011-08-06 01:56:55 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2011-08-06 01:56:55 +0200 |
| commit | 019766003237422f7179b32d205c6b6f8e3e9b5a (patch) | |
| tree | 1d9cfc9c343f306202af01c00224e91e06df77df /people/mac_names.lst | |
| parent | e7abcfa79985c555a79e36e371d56a524a689923 (diff) | |
| parent | a412a5761a4c943d91eb25ff9be9af26da94deca (diff) | |
emergency merge
Diffstat (limited to 'people/mac_names.lst')
| -rw-r--r-- | people/mac_names.lst | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/people/mac_names.lst b/people/mac_names.lst index ae58b539..85fbfb25 100644 --- a/people/mac_names.lst +++ b/people/mac_names.lst @@ -3,5 +3,12 @@ 00:26:c7:bd:a7:1a Martin 04:1e:64:05:39:28 Stephan 5c:59:48:22:2d:d2 Phil -00:21:00:fb:5c:b6 Kah Hah -00:1e:64:27:3b:72 Felix +00:21:00:fb:5c:b6 Kah-Hah +00:1e:64:27:3b:72 Felix +40:30:04:4f:de:73 Armin +00:26:c6:82:51:38 samuirai +3c:8b:fe:5c:4e:da Moh-Moh +00:26:bb:69:98:cc Jan +78:dd:08:d5:34:28 Patrick +78:ca:39:6e:ed:16 Tillman +00:22:43:25:61:79 Te vau |