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

[Jared Smith]

commit 512f4417fc4fcb4466fe46cf6eed63d50f8a5335
Merge: 24ebea7 300ae3f
Author: Jared K. Smith <jsmith at fedoraproject.org>
Date:   Mon Jan 23 13:26:22 2012 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/drupal7-views
    
    Conflicts:
    	drupal7-views.spec

 drupal7-views.spec |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --cc drupal7-views.spec
index cf655c7,3193b59..085eaa5
--- a/drupal7-views.spec
+++ b/drupal7-views.spec
@@@ -52,8 -52,9 +52,10 @@@ rm -rf %{buildroot
  %exclude %{drupaldir}/modules/views/*.txt
  
  %changelog
 +* Mon Jan 23 2012 Jared Smith <jsmith at fedoraproject.org> - 3.1-1
 +- Update to 3.1 release version
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
  * Fri Dec 23 2011 Jared Smith <jsmith at fedoraproject.org> - 3.0-1
  - Update to 3.0 release version
  * Thu Nov 17 2011 Jared Smith <jsmith at fedoraproject.org> - 3.0-0.1.rc3