From 23b7e5c055451f55617aebf07720feafd1427e33 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Mon, 27 Jan 2014 00:30:04 +0000
Subject: [PATCH] merge changelog changes from RC_0_16

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index bebf071fe..c968ad60c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,8 @@
 	* fix uTP edge case where udp socket buffer fills up
 	* fix nagle implementation in uTP
 
+0.16.14 release
+
 	* make lt_tex more robust against bugs and malicious behavior
 	* HTTP chunked encoding fix
 	* expose file_granularity flag to python bindings