Merge branch 'master' of github.com:tiliang/CVC4

Conflicts:
	NEWS

diff --cc NEWS
index 46f5deee269317b547084ca905037d10d58d0a34,e7c50201556afa1f4372b4bfb1cc84c67c3d1414..908d58b7daaeb1d9ba751ccc9da8beba337e02e0
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,10 -1,10 +1,5 @@@
  This file contains a summary of important user-visible changes.
  
--Changes since 1.3
--=================
--
- * Timed statistics are now properly updated even on process abort.
 -* none yet
--
  Changes since 1.2
  =================