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

[Ding-Yi Chen]

commit c023a373d34710d60f604bdb435b46fb61bfbcdf
Merge: 2f5e64d 0828523
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Fri Mar 8 16:27:17 2013 +1000

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

 leptonica.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc leptonica.spec
index 192ec57,a854c89..c628f2c
--- a/leptonica.spec
+++ b/leptonica.spec
@@@ -77,9 -77,9 +77,12 @@@ rm -rf %{buildroot
  %{_libdir}/%{libname}.so
  
  %changelog
 +* Fri Mar 08 2013 Ding-Yi Chen <dchen at redhat.com> - 1.69-8
 +- Rebuild to resolves #914124
 +
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.69-7
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Thu Jan 24 2013 Ding-Yi Chen <dchen at redhat.com> - 1.69-6
  - Rebuild for dependency libwebp-0.2.1-1