[eclipse-checkstyle: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/eclipse-checkstyle

[mbooth]

commit 276f5903d56b0197701f6fd965d8aac21df79231
Merge: 3264723 05592ad
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Fri Aug 16 13:52:03 2013 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/eclipse-checkstyle
    
    Conflicts:
    	eclipse-checkstyle.spec

 eclipse-checkstyle.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc eclipse-checkstyle.spec
index 44802e1,962892e..574e5e8
--- a/eclipse-checkstyle.spec
+++ b/eclipse-checkstyle.spec
@@@ -133,11 -114,9 +133,14 @@@ pop
  %{install_loc}
  
  %changelog
 +* Fri Aug 16 2013 Mat Booth <fedora at matbooth.co.uk> 5.6.1-1
 +- Update to 5.6.1
 +- Build with maven/tycho
 +- Drop upstreamed patches
 +
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.1.0-9
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Mon Apr 22 2013 Mat Booth <fedora at matbooth.co.uk> 5.1.0-8
  - Fix broken symlink to beanutils, remove unused patches.
  - Add missing runtime requirements.