From: Ulrich Drepper <drepper@gmail.com>
Date: Mon, 9 May 2011 13:01:52 +0000 (-0400)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.14~135
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=0f7843d00f0703837f380eb03143a4ed5d485ead;p=glibc.git

Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
	localedata/ChangeLog
---

0f7843d00f0703837f380eb03143a4ed5d485ead
diff --cc localedata/ChangeLog
index f5a3d96a51,a4f8a13dde..c9dad8df25
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@@ -1,10 -1,8 +1,15 @@@
 +2011-05-09  Ulrich Drepper  <drepper@gmail.com>
 +
 +	[BZ #12738]
 +	* locales/os_RU: New file.
 +	Contributed by Soslan Khubulov <soslanx@gmail.com>.
 +	* SUPPORTED: Add entry for os_RU.
 +
+ 2010-12-02  Andreas Schwab  <schwab@redhat.com>
+ 
+ 	* SUPPORTED: Remove .UTF-8 suffix from az_AZ, as_IN, tt_RU locale
+ 	names.
+ 
  2010-05-17  Andreas Schwab  <schwab@redhat.com>
  
  	* locales/es_CR (LC_ADDRESS): Fix character names in lang_ab.