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

[Jon Ciesla]

commit 7698ac8597275d48b196bfe503d1d4e2cbfaa143
Merge: 5780a7f a300296
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu May 8 07:25:23 2014 -0500

    Merge branch 'el6' into el5

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