merges r30448 and r30498 from trunk into ruby_1_9_2.

--

* lib/irb/locale.rb (IRB::Locale#search_file): make it possible
  to load a localization from a gem.
  (IRB::Locale#lc_path): obsoleted because of the change of #search_file
  (IRB::Locale#each_localized_path): new private method, based on lc_path
  (IRB::Locale#find): follows the change of #search_file.
  (IRB::Locale#load): removed duplicate with #find.
--
* lib/irb/locale.rb (IRB::Locale::LOCALE_NAME_RE):
  some platoform has a locale without territory but with
  encoding.
  (#each_sub_locale): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/version.h b/version.h
index d509b4a120..57d20fae7a 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 143
+#define RUBY_PATCHLEVEL 144
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1