[vlc-devel] commit: Merge names... (Jean-Baptiste Kempf )

[git version control]

vlc | branch: 1.0-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jun 14 21:30:40 2009 +0200| [688dfda319ae0b9ec3f59a301e383f42019ec8b2] | committer: Jean-Baptiste Kempf 

Merge names...

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=688dfda319ae0b9ec3f59a301e383f42019ec8b2
---

 THANKS |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/THANKS b/THANKS
index 4ebc79a..fcca52f 100644
--- a/THANKS
+++ b/THANKS
@@ -88,8 +88,7 @@ Dermot McGahon <dermot at dspsrv dot com> - Bug fixes, RC interface loop and rep
 Diego Petteno <flameeyes at gentoo dot org> - remove usage of internal ffmpeg symbols, configure fixes
 DirektX <direktx at freemail.hu> - Hungarian translation
 Dominic Spitaler <Dominic dot Spitaler at gmx dot at> - Mac OS X Document Icons (v1.0)
-Dominique Leuenberger <dominique-vlc dot suse at leuenberger dot net> - SuSE packaging
-Dominique Leuenberger <dominique at leuenberger dot net> - xulrunner-1.9.1 patches
+Dominique Leuenberger <dominique-vlc dot suse at leuenberger dot net> - SuSE packaging && xulrunner-1.9.1 patches
 Dugal Harris - DirectShow fixes and MJPEG patches
 Dylan Aïssi <aissi dot dylan at free dot fr> - French translation
 Dylan Yudaken <dyudaken -- gmail # com> - hotkeys patch