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

[cheese]

commit cf9d54c2aac698f342f7fd6e784f13aa769e8335
Merge: ea8ae89 abe1fbf
Author: josef radinger <cheese at nosuchhost.net>
Date:   Sat Jun 21 16:09:29 2014 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/R-combinat
    
    Conflicts:
    	R-combinat.spec

 R-combinat.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --cc R-combinat.spec
index 824b34d,23353aa..6fd727a
--- a/R-combinat.spec
+++ b/R-combinat.spec
@@@ -46,15 -48,8 +46,15 @@@ test -d %{packname}/src && (cd %{packna
  %{_datadir}/R/library/%{packname}/help
  
  %changelog
 +* Sat Jun 21 2014 josef radinger <cheese at nosuchhost.net> - 0.0.8-9
 +- check build
 +- cleanup specfile
 +
 +* Tue Jun 17 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 0.0.8-8
 +- Build FTBFS with R-3.0 (#991949, #1105922)
 +
- * Sat Aug 03 2013 josef radinger <cheese at nosuchhost.net> - 0.0.8-7
- - check build
+ * Fri Jun 06 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.8-7
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
  
  * Fri Aug 02 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.8-6
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild