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

[Jared Smith]

commit c67c62c9c08c64fa6d5c924176183f6d341dcd9c
Merge: 7b5103a df40c8e
Author: Jared K. Smith <jaredsmith at jaredsmith.net>
Date:   Wed Oct 15 16:29:35 2014 -0400

    Merge branch 'master' into el6

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