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

[John Dennis]

commit c98f5f2c6347845ea6cd28adf8cee53719d57d58
Merge: 7e11ad3 e57796e
Author: John Dennis <jdennis at redhat.com>
Date:   Mon Jul 22 19:05:00 2013 -0400

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

 freeradius.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc freeradius.spec
index b46e11e,8cf9800..65b4dc4
--- a/freeradius.spec
+++ b/freeradius.spec
@@@ -707,11 -604,12 +707,14 @@@ exit 
  
  %files unixODBC
  %{_libdir}/freeradius/rlm_sql_unixodbc.so
 -%{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so
  
  %changelog
 +* Mon Jul 22 2013 John Dennis <jdennis at redhat.com> - 3.0.0-rc0.0
 +- Upgrade to new upstream major version release
 +
+ * Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 2.2.0-7
+ - Perl 5.18 rebuild
+ 
  * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.0-6
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild