[Pkg-isocodes-devel] [SCM] ISO language, territory, currency, script codes and their translations branch, master, updated. iso-codes/3.31-5-gd3f97e3

[Christian PERRIER]

The following commit has been merged in the master branch:
commit d3f97e31befb2d778074b393cccf048d389a01ce
Merge: 56cd14de5fc3a21764b68365650e32882228c277 e0613c459f8538ae96b0c56ee6539885971ae2cb
Author: Christian PERRIER <bubulle at debian.org>
Date:   Tue Dec 27 17:31:58 2011 +0100

    Resolve conflict


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