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

[Clément David]

commit 012786b01dd0ce6231522c515bfefc43943d34ab
Merge: e220153 5fba95d
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date:   Wed Mar 19 18:07:29 2014 +0100

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

 jlatexmath.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc jlatexmath.spec
index 94859ae,db6c491..cbce75e
--- a/jlatexmath.spec
+++ b/jlatexmath.spec
@@@ -87,9 -87,9 +87,12 @@@ cp -rp doc/ $RPM_BUILD_ROOT%{_javadocdi
  %{_javadocdir}/%{name}
  
  %changelog
 +* Wed Mar 19 2014 Clément David <c.david86 at gmail.com> - 1.0.3-1
 +- Update version to 1.0.3
 +
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Fri Mar 29 2013 Clément David <c.david86 at gmail.com> - 1.0.2-1
  - Update version to 1.0.2