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

[Christian PERRIER]

The following commit has been merged in the master branch:
commit 918784dd141c9297dcd5dd7fb792590b459f2253
Merge: d5389b15564cd03375a90dfad1d3d04fa1c1213d a5493f40bfc967949bad3dd7c8f77f05fb73f3f3
Author: Christian PERRIER <bubulle at debian.org>
Date:   Sun Feb 17 14:54:09 2013 +0100

    Merge conflict

diff --combined ChangeLog
index 2bae0d5,2b57cd0..f1d8de6
--- a/ChangeLog
+++ b/ChangeLog
@@@ -42,7 -42,7 +42,8 @@@ UNRELEASE
    * Spanish by Lenin Zamir Flores Rossmann.
    * Estonian by Tõivo Leedjärv. Closes: #700519
    * Lithuanian by Rimas Kudelis. Closes: #700698
 +  * Italian by Milo Casagrande.
+   * Czech by Miroslav Kure.
  
    [ ISO 639-3 translations ]
    * German by Hendrik Knackstedt
@@@ -59,6 -59,7 +60,7 @@@
    * Russian by Yuri Kozlov (TP)
    * Italian by Milo Casagrande (TP)
    * Bulgarian by Roumen Petrov (TP)
+   * Czech by Miroslav Kure
  
    [ ISO 15924 translations ]
    * Ukrainian by Yuri Chornoivan (TP)

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