diff --git a/CHANGELOG.ja.rdoc b/CHANGELOG.ja.rdoc index 1e6cb9a5363..a492a3343c0 100644 --- a/CHANGELOG.ja.rdoc +++ b/CHANGELOG.ja.rdoc @@ -1,3 +1,11 @@ +=== 1.5.11 / 2013年12月14日 + +* Bugfixes + + * (JRuby) Fix out of memory bug when certain invalid documents are parsed. + * (JRuby) Fix regression of billion-laughs vulnerability. #586 + + === 1.5.10 / 2013年6月7日 * バグ修正 diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc index 1b85e0f1179..5a535afcb17 100644 --- a/CHANGELOG.rdoc +++ b/CHANGELOG.rdoc @@ -1,3 +1,10 @@ +=== 1.5.11 / 2013-12-14 + +* Bugfixes + + * (JRuby) Fix out of memory bug when certain invalid documents are parsed. + * (JRuby) Fix regression of billion-laughs vulnerability. #586 + === 1.5.10 / 2013-06-07 * Bugfixes