[repoview/el6: 9/9] Merge branch 'master' into el6

[Konstantin Ryabitsev]

commit 4fe244144d13fff73ed171440ee0e5e4753cbc9c
Merge: 51dc387 72f1125
Author: Konstantin Ryabitsev <mricon at kernel.org>
Date:   Wed Nov 16 13:19:13 2011 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	repoview.spec
    	sources

 .gitignore    |    2 +-
 repoview.spec |    7 +++++--
 sources       |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index d23693a,2999c87..bddb978
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,2 @@@
--repoview-0.6.5.tar.gz
++repoview-0.6.6.tar.xz
  fedora-repoview-templates.tar.gz
 -/repoview-0.6.6.tar.xz
diff --cc repoview.spec
index df48370,365de27..144b124
--- a/repoview.spec
+++ b/repoview.spec
@@@ -59,6 -59,12 +59,9 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
+ * Wed Nov 16 2011 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.6-1
+ - Update to 0.6.6 (bugfixes)
+ 
 -* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.5-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
  * Fri Feb 19 2010 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.5-1
  - Update to 0.6.5 (bugfixes)