[drupal7-votingapi: 2/2] Merge branch 'f16'

[Scott Dodson]

commit 4bb99fc717c0816a4ea06b89b2702499cec47975
Merge: 7c7aa3b 7131547
Author: Scott Dodson <sdodson at redhat.com>
Date:   Fri Mar 2 16:00:49 2012 -0500

    Merge branch 'f16'
    
    Conflicts:
    	drupal7-votingapi.spec

 .gitignore                                   |    1 +
 LICENSE.txt => drupal7-votingapi-LICENSE.txt |    0
 drupal7-votingapi.spec                       |   11 ++++++-----
 sources                                      |    2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)
---
diff --cc drupal7-votingapi.spec
index 45edfa1,674945c..c62ad3f
--- a/drupal7-votingapi.spec
+++ b/drupal7-votingapi.spec
@@@ -70,8 -70,7 +70,9 @@@ rm -rf %{buildroot
  %{drupaldir}/modules/%{modname}
  
  %changelog
+ * Fri Mar 2 2012 Scott Dodson <sdodson at redhat.com> - 2.6-1
+ - Update to 2.6
 +* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
- 
  * Wed Sep 7 2011 Scott Dodson <sdodson at redhat.com> - 2.4-1
  - Initial Drupal 7 package