diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-30 02:25:32 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-30 02:25:32 +0000 |
commit | 510f6dc7d0c6e78463796bdb90a90a486e4a2042 (patch) | |
tree | 38a03341df19fb6f2ba6452aa4a82c841f941e8d /ChangeLog | |
parent | f363d4d8c18ca44b641fdbd873c97ce234e053d3 (diff) |
merge revision(s) 33122:
* ext/json: Merge json gem 1.5.4+ (2149f4185c598fb97db1).
[Bug #5173] [ruby-core:38866]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33123 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Tue Aug 30 11:25:21 2011 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/json: Merge json gem 1.5.4+ (2149f4185c598fb97db1). + [Bug #5173] [ruby-core:38866] + Tue Aug 30 09:53:59 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * cont.c (fiber_entry): fix stack allocation failure on Debian |