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

[Jon Ciesla]

commit 78d5351d6bbf0ccb8b5c7d47cfbd46c20daba20f
Merge: 6294ea3 bac6087
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Nov 10 07:30:04 2014 -0600

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

 gitolite3.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc gitolite3.spec
index a5bc8f4,a9c9f67..131c0c8
--- a/gitolite3.spec
+++ b/gitolite3.spec
@@@ -91,9 -91,9 +91,12 @@@ exit 
  
  
  %changelog
 +* Mon Nov 10 2014 Jon Ciesla <limburgher at gmail.com> - 1:3.6.2-1
 +- Latest upstream.
 +
+ * Tue Aug 26 2014 Jitka Plesnikova <jplesnik at redhat.com> - 1:3.6.1-2
+ - Perl 5.20 rebuild
+ 
  * Mon Jun 23 2014 Jon Ciesla <limburgher at gmail.com> - 1:3.6.1-1
  - Latest upstream.