Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
	Makefile.am
	WIN32-Code/event2/event-config.h
	configure.in

ChangeLog

@@ -1,10 +1,13 @@
-Changes in version 2.0.14-stable (?? ??? 2011)
+Changes in version 2.0.15-stable (?? ??? 2011)
+
+Changes in version 2.0.14-stable (31 Aug 2011)
 BUGFIXES (bufferevents and evbuffers):
  o Propagate errors on the underlying bufferevent to the user. (4a34394 Joachim Bauch)
  o Ignore OpenSSL deprecation warnings on OS X (5d1b255 Sebastian Hahn)
  o Fix handling of group rate limits under 64 bytes of burst (6d5440e)
  o Solaris sendfile: correctly detect amount of data sent (643922e Michael Herf)
  o Make rate limiting work with common_timeout logic (5b18f13)
+ o clear read watermark on underlying bufferevent when creating filtering bev to fix potentially failing fragmented ssl handshakes (54f7e61 Joachim Bauch)
 
 BUGFIXES (IOCP):
  o IOCP: don't launch reads or writes on an unconnected socket (495c227)

Makefile.am

@@ -47,6 +47,8 @@ VERSION_INFO = 1:0:0
 #  2.0.10-stable--    2.0        5:1:0 (No ABI change)
 #  2.0.11-stable--    2.0        6:0:1 (ABI changed, backward-compatible)
 #  2.0.12-stable--    2.0        6:1:1 (No ABI change)
+#  2.0.13-stable--    2.0        6:2:1 (No ABI change)
+#  2.0.14-stable--    2.0        6:3:1 (No ABI change)
 #
 # For Libevent 2.1:
 #  2.1.1-alpha --     2.1        1:0:0

README

@@ -95,6 +95,7 @@ fixing bugs:
   Mihai Draghicioiu
   Mark Ellzey
   Shie Erlich
+  Leonid Evdokimov
   Christophe Fillot
   Alexander von Gernler
   Artur Grabowski
@@ -105,6 +106,7 @@ fixing bugs:
   Tani Hosokawa
   Claudio Jeker
   Evan Jones
+  George Kadianakis
   Phua Keat
   Kevin Ko
   Brian Koehmstedt
@@ -118,6 +120,7 @@ fixing bugs:
   David Libenzi
   Yan Lin
   Moshe Litvin
+  Mitchell Livingston
   Hagne Mahre
   Lubomir Marinov
   Nick Mathewson