[SCM] httpcomponents-client: HTTP/1.1 compliant HTTP agent Java implementation branch, master, updated. debian/4.2.1-2-13-g22568d1

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit 3bb3983686c2a13b25162473c0257005c5439aaa
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Wed May 8 00:18:36 2013 +0200

    Restore RELEASE_NOTES.txt

diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 8abdb41..cbb1baf 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 Release 4.2.5
 -------------------
 
@@ -209,7 +207,6 @@ Changelog
   Contributed by Oleg Kalnichevski <olegk at apache.org>
 
 
->>>>>>> upstream/4.2.5
 Release 4.2.1 
 -------------------
 

-- 
httpcomponents-client: HTTP/1.1 compliant HTTP agent Java implementation