[LyX 2.0.x] Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x

[Uwe Stöhr]

The branch, 2.0.x, has been updated.

- Log -----------------------------------------------------------------

commit 213f8f7237be825f699fd16c7f87edb5834b1fa3
Merge: 6fc2abe b59496c
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Mon May 7 22:21:04 2012 +0200

    Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x


commit 6fc2abe7e6ed6dcece4b1b1928b98a14bf58cc3c
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Mon May 7 22:20:41 2012 +0200

    CREDITS, generate_contributions.py: correct a mail address

diff --git a/lib/CREDITS b/lib/CREDITS
index acfe3d8..0338b6d 100644
--- a/lib/CREDITS
+++ b/lib/CREDITS
@@ -149,7 +149,7 @@
 @iE-mail: edscott () xfce ! org
    Bug fixes
 @bIgnacio García
-@iE-mail: ignacio.garcia () tele2 ! es
+@iE-mail: ignacio.gmorales () gmail ! com
    Spanish translation of documentations
 @bMichael Gerz
 @iE-mail: michael.gerz () teststep ! org
diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index 4e1cedb..b08790f 100755
--- a/lib/generate_contributions.py
+++ b/lib/generate_contributions.py
@@ -706,7 +706,7 @@ contributers = [
                  u"Bug fixes"),
 
      contributer(u"Ignacio García",
-                 "ignacio.garcia () tele2 ! es",
+                 "ignacio.gmorales () gmail ! com",
                  "GPL",
                  "Re: es_EmbeddedObjects",
                  "m=117079592919653",

-----------------------------------------------------------------------

Summary of changes:
 lib/CREDITS                   |    2 +-
 lib/generate_contributions.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository