From ea8a5b9a8d525919f4b0819ec12ab54e82f8e6a2 Mon Sep 17 00:00:00 2001
From: Ariya Hidayat <ariya.hidayat@gmail.com>
Date: Fri, 1 Mar 2013 21:33:44 -0800
Subject: [PATCH] ChangeLog: Include the superimportant iframe crash fix.

http://code.google.com/p/phantomjs/issues/detail?id=863
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 1856c1c0..bc920193 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ Please see also http://phantomjs.org/releases.html.
 
       * Fixed possible PDF error due to invalid CreationDate field (issue 663)
       * Fixed crash when uploading non existing files (issue 941)
+      * Fixed possible crash when accessing inline frames (issue 947)
       * Extended SSL ignore setting to synchronous XHR (issue 985)
       * Fixed incorrect date handling in the cookies (issue 1068)