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

[Jon Ciesla]

commit 294ceca0c0597a38a0f0f857c6dd1669e8656cf9
Merge: 6d5e0ad 9c4d865
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Jun 18 08:48:50 2013 -0500

    Merge branch 'el6' into el5

 drupal7.conf |    1 +
 drupal7.spec |    9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)
---