[haddock: 3/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/haddock

[narasim]

commit 477b49dde52faf0ffea9db26394a1db58db86f8f
Merge: 9f4b128 e0d95d2
Author: Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com>
Date:   Sat Nov 19 15:12:24 2011 +0530

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/haddock
    
    Conflicts:
    	haddock.spec
    
    	modified:   haddock.spec

 haddock.spec |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --cc haddock.spec
index a2e239a,fd33125..b3f475c
--- a/haddock.spec
+++ b/haddock.spec
@@@ -52,9 -52,12 +52,15 @@@ mv $RPM_BUILD_ROOT%{_bindir}/%{name}{,-
  
  
  %changelog
 +* Thu Nov 17 2011 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 2.9.4-1
 +- Upgrade to 2.9.4
 +
+ * Fri Oct 21 2011 Marcela Mašláňová <mmaslano at redhat.com> - 2.9.2-3.2
+ - rebuild with new gmp without compat lib
+ 
+ * Tue Oct 11 2011 Peter Schiffer <pschiffe at redhat.com> - 2.9.2-3.1
+ - rebuild with new gmp
+ 
  * Tue Jun 21 2011 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 2.9.2-3
  - Update to  cabal2spec-0.23.2