[drupal7-date/el6: 7/7] Merge branch 'master' into el6

[Jared Smith]

commit e7ababcc5942423096393c5ff594a2aa6b2fb0d9
Merge: 7353003 7001f97
Author: Jared K. Smith <jaredsmith at jaredsmith.net>
Date:   Thu Jul 31 11:09:39 2014 -0400

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	drupal7-date.spec
    	sources

 .gitignore        |    1 +
 drupal7-date.spec |   17 +++++++++++++++--
 sources           |    2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)
---
diff --cc drupal7-date.spec
index da44b6c,eaec661..a8d397b
--- a/drupal7-date.spec
+++ b/drupal7-date.spec
@@@ -51,9 -58,14 +58,15 @@@ rm -rf %{buildroot
  - Update to upstream 2.7 release for bug fixes
  - Upstream changelog for this release is available at https://drupal.org/node/2161141
  
- * Wed Oct 27 2012 Jared Smith <jsmith at fedoraproject.org> - 2.6-4
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
+ * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
+ * Wed Oct 27 2012 Jared Smith <jsmith at fedoraproject.org> - 2.6-3
  - Update to upstream release 2.6
 +- Upstream changelog at http://drupal.org/node/1727916
  * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
  * Thu Apr 19 2012 Jared Smith <jsmith at fedoraproject.org> - 2.5-1