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

[Christian PERRIER]

The following commit has been merged in the master branch:
commit 26f702563b0e59129d30a7d1d814d5332c7d0ad0
Merge: d9f1089c3523f2488f67214830324eb125861b17 73695dd38fc56cc4315b356915dd8ce6d8c5ea56
Author: Christian PERRIER <bubulle at debian.org>
Date:   Wed Feb 13 07:08:02 2013 +0100

    Merge conflict

diff --combined ChangeLog
index 020c3e8,f90d3f6..226d1ea
--- a/ChangeLog
+++ b/ChangeLog
@@@ -27,10 -27,7 +27,11 @@@ UNRELEASE
    * German by Tobias Quathamer
    * French by Christian Perrier
    * Vietnamese by Hoang Nguyen
 +  * Persian by حجتاله.
 +  * Khmer by Khoem Sokhem.
 +  * Indonesian by Mahyuddin Susanto.
 +  * Brazilian Portuguese by Leonardo Ferreira Fontenelle.
+   * Thai by Theppitak Karoonboonyanan
  
    [ ISO 639-3 translations ]
    * German by Hendrik Knackstedt

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