[Pkg-isocodes-devel] [SCM] ISO language, territory, currency, script codes and their translations branch, master, updated. 911a13ac03994f654113aa0eb236b92b0d4d86d9

[Christian PERRIER]

The following commit has been merged in the master branch:
commit 911a13ac03994f654113aa0eb236b92b0d4d86d9
Merge: 9f8939a3ea1b233943d2231db6660a697a61a598 43466ad5f77d8dcf1a7e206b3b460862e30f4ce0
Author: Christian PERRIER <bubulle at debian.org>
Date:   Tue Feb 12 18:01:33 2013 +0100

    Merge conflict

diff --combined ChangeLog
index 25b2b97,2182cb8e..b566e5e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -21,9 -21,9 +21,12 @@@ UNRELEASE
    * Indonesian (Mahyuddin Susanto). Closes: #695663
    * Portuguese by Miguel Figueiredo. Closes: #698391
    * Interlingua by Nik Kalach (TP)
 +  * Kazakh by Baurzhan Muftakhidinov.  Closes: #700379
 +  * Norwegian Nynorsk by Haavard Korsvoll. Closes: #700400
 +  * Hindi by Kumar Appaiah. Closes: #700417
+   * German by Tobias Quathamer
+   * French by Christian Perrier
+   * Vietnamese by Hoang Nguyen
  
    [ ISO 639-3 translations ]
    * German by Hendrik Knackstedt

-- 
ISO language, territory, currency, script codes and their translations