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

[Jon Ciesla]

commit 107be802e8a35f1b982a94194ebdc8c4345351d1
Merge: 20a762d 1162f6d
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Dec 20 06:03:06 2012 -0600

    Merge branch 'el6' into el5

 .gitignore   |    1 +
 drupal6.spec |    7 +++++--
 sources      |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---