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

[Alexander Kurtakov]

commit 040da4904bd3ee8863df795670e7de0b1dab3234
Merge: 0cd4997 fed6934
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu Feb 14 13:40:37 2013 +0200

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

 jetty.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc jetty.spec
index 4ae51c0,91ba4d4..a75e322
--- a/jetty.spec
+++ b/jetty.spec
@@@ -941,9 -941,9 +941,12 @@@ getent passwd %username &>/dev/null || 
  %doc %{_javadocdir}/%{name}
  
  %changelog
 +* Thu Feb 14 2013 Alexander Kurtakov <akurtako at redhat.com> 8.1.9-1
 +- Update to 8.1.9.
 +
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.1.5-12
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
  * Wed Feb 06 2013 Java SIG <java-devel at lists.fedoraproject.org> - 8.1.5-11
  - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
  - Replace maven BuildRequires with maven-local