From 8d89e06c34a0a22e006a74d48d4cc8843b293f73 Mon Sep 17 00:00:00 2001
From: Tianyi Liang <tianyi-liang@uiowa.edu>
Date: Sun, 15 Dec 2013 11:51:44 -0600
Subject: [PATCH] resolve merge issue.

---
 NEWS | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/NEWS b/NEWS
index 908d58b7d..46f5deee2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 This file contains a summary of important user-visible changes.
 
+Changes since 1.3
+=================
+
+* Timed statistics are now properly updated even on process abort.
+
 Changes since 1.2
 =================
 
-- 
2.30.2