[jansson: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/jansson

[Sean Middleditch]

commit f87e20cd1f27ac8b9d9686dabeb2ed982190719a
Merge: 53f7531 863fcdc
Author: Sean Middleditch <sean at middleditch.us>
Date:   Sun Jun 12 16:20:41 2011 -0700

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

 jansson.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc jansson.spec
index 782c858,d3780a7..fbb4fb8
--- a/jansson.spec
+++ b/jansson.spec
@@@ -59,10 -63,9 +59,13 @@@ rm -rf "$RPM_BUILD_ROOT
  %{_includedir}/*
  
  %changelog
 +* Thu Jun 11 2011 Sean Middleditch <sean at middleditch.us> 2.1-1
 +- Update to Jansson 2.1.
 +- Drop Sphinx patch, no longer necessary.
 +
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Thu Jul 03 2010 Sean Middleditch <sean at middleditch.us> 1.3-1
  - Update to Jansson 1.3.
  - Disable warnings-as-errors for Sphinx documentation.