Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / lib / generate_contributions.py

diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index 98e99e7eada6a393738eddac201455c5c6fe12c0..6358b5ea8a832e383d97f977073ca791430e5631 100755 (executable)
--- 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",
@@ -783,7 +783,7 @@ contributers = [
                  "GPL Statement",
                  "m=117501689204059",
                  "27 March 2007",
-                 u"Bug fixes, layout modules, BibTeX code, XHTML export"),
+                 u"Bug fixes, layout modules, BibTeX code, XHTML export. Current stable branch maintainer."),
 
      contributer(u"Bennett Helm",
                  "bennett.helm () fandm ! edu",
@@ -953,6 +953,14 @@ contributers = [
                  "",
                  u"Hungarian translation and bind file for menu shortcuts"),
 
+     contributer(u'Marcus Kriele',
+                 "mkriele () me ! com",
+                 "GPL",
+                 "License permission",
+                 "m=130384781027177",
+                 "26 April 2011",
+                 u"Fixing various sv* layouts"),
+
      contributer(u'Valeriy Kruchko',
                  "lerkru () gmail ! com",
                  "GPL",
@@ -1497,6 +1505,14 @@ contributers = [
                  "23 February 2005",
                  u"contribution to the spanish internationalization"),
 
+     contributer(u"Nickolay Shashkin",
+                 "mecareful () gmail ! com",
+                 "GPL",
+                 "GPL statement",
+                 "m=134026564400578",
+                 "21 June 2012",
+                 u"bugfixes"),
+
      contributer(u"Miyata Shigeru",
                  "miyata () kusm ! kyoto-u ! ac ! jp",
                  "",
@@ -1551,7 +1567,7 @@ contributers = [
                  "Re: The LyX licence",
                  "m=110907530127164",
                  "22 February 2005",
-                 u"Qt frontend, bugfixes. Current stable branch maintainer."),
+                 u"Qt frontend, bugfixes. Former stable branch maintainer."),
 
      contributer(u"John Spray",
                  "jcs116 () york ! ac ! uk",