[drupal7/el5: 2/2] Merge branch 'el6' into el5

[Paul W. Frields]

commit 9ae7c0260adaffb0b4fafd7555b0269fd3a159bd
Merge: 7698ac8 d1290d9
Author: Paul W. Frields <stickster at gmail.com>
Date:   Wed Jul 16 19:10:42 2014 -0400

    Merge branch 'el6' into el5

 .gitignore   |    1 +
 drupal7.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---