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

[Jon Ciesla]

commit 20a762d1cf320de2a8d9202854f294919a214c6c
Merge: 18dd54d bf85c8a
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Fri Nov 16 12:30:50 2012 -0600

    Merge branch 'el6' into el5

 drupal6.conf                     |   24 +++++----
 drupal6.spec                     |   16 ++++++-
 json-encode-fix-1086098-90.patch |  104 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 133 insertions(+), 11 deletions(-)
---