[plantuml: 2/2] Merge branch 'f20' into f21

[Jan Šafránek]

commit 7d59ae5d94fd44dac35e9740d8addf3322f211bb
Merge: 63cc7a6 5f07160
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Fri Mar 6 11:44:55 2015 +0100

    Merge branch 'f20' into f21
    
    Conflicts:
    	plantuml.spec

 plantuml.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --cc plantuml.spec
index 9092706,25f31d9..215b01d
--- a/plantuml.spec
+++ b/plantuml.spec
@@@ -65,12 -65,9 +65,15 @@@ cp -rp javadoc/* $RPM_BUILD_ROOT%{_java
  %{_javadocdir}/%{name}
  
  %changelog
+ * Fri Mar  6 2015 Jan Safranek <jsafrane at redhat.com> - 8020-1
+ - Update to ver. 8020
+ 
 +* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7992-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 +
 +* Tue Feb 18 2014 Jan Safranek <jsafrane at redhat.com> - 7992-1
 +- Update to ver. 7992
 +
  * Thu Aug 29 2013 Jan Safranek <jsafrane at redhat.com> - 7978-1
  - Update to ver. 7978