[httpie] Fix changelog from merge conflicts

[Ricky Elrod]

commit d707aa3a6dbbd4eef3e90d557d802ec14e552f3e
Author: Ricky Elrod <ricky at elrod.me>
Date:   Sat Sep 28 18:27:12 2013 -0400

    Fix changelog from merge conflicts

 httpie.spec |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/httpie.spec b/httpie.spec
index 4b92192..a569f9d 100644
--- a/httpie.spec
+++ b/httpie.spec
@@ -137,12 +137,12 @@ help2man --no-discard-stderr %{buildroot}/%{_bindir}/python3-http > %{buildroot}
 - Only try building the manpage on Fedora, since RHEL's help2man doesn't
   have the --no-discard-stderr flag.
 
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Sep 5 2013 Ricky Elrod <codeblock at fedoraproject.org> - 0.6.0-5
+* Thu Sep 5 2013 Ricky Elrod <codeblock at fedoraproject.org> - 0.6.0-6
 - Loosen the requirement on python-pygments.
 
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Tue Jul 2 2013 Ricky Elrod <codeblock at fedoraproject.org> - 0.6.0-4
 - python-requests 1.2.3 exists in rawhide now.