[Pkg-isocodes-devel] [SCM] ISO language, territory, currency, script codes and their translations branch, master, updated. iso-codes/3.10.1-10-g28423c3

[Tobias Quathamer]

The following commit has been merged in the master branch:
commit 95ac6361b77bdb83ef62e886e67a6f1f32ccc232
Author: Tobias Quathamer <toddy at debian.org>
Date:   Thu Jul 23 21:51:44 2009 +0200

    We cannot merge ISO 639 and ISO 639-3 currently

diff --git a/README b/README
index ebc9731..6a6c246 100644
--- a/README
+++ b/README
@@ -76,8 +76,7 @@ This is a further development of ISO 639-2, see above. All codes
 of ISO 639-2 are included in ISO 639-3. ISO 639-3 attempts to
 provide as complete an enumeration of languages as possible,
 including living, extinct, ancient, and constructed languages,
-whether major or minor, written or unwritten. We're currently
-in the progress of merging ISO 639-2 and ISO 639-3. The gettext
+whether major or minor, written or unwritten. The gettext
 domain is "iso_639_3". The official ISO 639-3 maintenance agency
 is SIL International.
 <http://www.sil.org/iso639-3/>

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