Marcus Meissner : adjusted my entry in who

[Jeremy Newman]

Module: website
Branch: master
Commit: 0f5a96951700cb243e3e2c8a3aa97dce9330b22c
URL:    http://source.winehq.org/git/website.git/?a=commit;h=0f5a96951700cb243e3e2c8a3aa97dce9330b22c

Author: Marcus Meissner <marcus at jet.franken.de>
Date:   Sun Apr  6 19:36:03 2008 +0200

adjusted my entry in who

---

 templates/en/who.template |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/templates/en/who.template b/templates/en/who.template
index 76cb502..70fe288 100644
--- a/templates/en/who.template
+++ b/templates/en/who.template
@@ -347,8 +347,8 @@ Please email additions, corrections, and flames to
       
 <h3>Marcus Meissner</h3><blockquote>
     <table border="0"><tr>
-    <td width="300"><b>Location:</b> Erlangen, Germany<br /></td>
-	<td><b>IRC Nick:</b> _marcus_</td></tr>
+    <td width="300"><b>Location:</b> N&uuml;rnberg, Germany<br /></td>
+	<td><b>IRC Nick:</b> _Marcus_</td></tr>
     <tr><td>
     <b>Email:</b> marcus -at- jet dot franken dot de </td>
     <td><b>Interview:</b> <a href="http://www.winehq.org/?interview=3">#3</a></td></tr></table> 
@@ -357,14 +357,15 @@ Please email additions, corrections, and flames to
     of patches and bugfixes.  He is personally to blame for the first 
     revisions of reading and saving the Registry, starting the DirectX
     implementation, doing the second OLE out of process COM support 
-    implementation, and more.
+    implementation, and more. In these times he is taking care that
+    the SUSE Wine RPMs get build and some small bug fixes.
     </p><p>
     Marcus studied computer science at the University of Erlangen and 
     graduated in 1997. After doing civil duty, he started 
     working as Senior Developer for Caldera Systems in 1999, working on 
     distribution development. After Caldera closed its development office 
-    in 2002 he started and is now working for the SuSE Linux AG as a 
-    Developer in the PowerPC group.
+    in 2002 he started and is now working for the SUSE Linux Products GmbH as a 
+    Teamlead of the Security Team.
     </p></blockquote>
 
 <h3>Andreas Mohr</h3><blockquote>