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

[Golo Fuchert]

commit 5bb4470e78ef0e8101b0a064242b933e18dd785d
Merge: 76280ea 938d68b
Author: golfu <packages at golotop.de>
Date:   Wed Mar 21 23:18:09 2012 +0100

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

 parallel.spec |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --cc parallel.spec
index 4696ea7,6c8aba6..534258d
--- a/parallel.spec
+++ b/parallel.spec
@@@ -65,14 -63,14 +65,16 @@@ install -pD -m644 %{SOURCE1} %{buildroo
  %{_mandir}/man1/niceload.1.*
  %{_mandir}/man1/parallel.1.*
  %{_mandir}/man1/sem.1.*
 -%{_mandir}/man1/sql.1.*
 +%{_mandir}/man1/parallel-sql.1.*
  %doc README NEWS COPYING src/parallel.html src/sem.html src/sql.html 
 -%doc src/niceload.html
 +%doc src/niceload.html src/*.texi
  
  %changelog
 +* Wed Mar 21 2012 Golo Fuchert <packages at golotop.de> - 20120222-1
 +- Updated to newest version 20120222
 +- renamed manpage sql to parallel-sql (naming conflict, bug 797823)
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20110722-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
  * Fri Sep 09 2011 Golo Fuchert <packages at golotop.de> - 20110722-3
  - Added niceload.html to doc
  * Fri Sep 09 2011 Golo Fuchert <packages at golotop.de> - 20110722-2