commit 14ae296b631f15ef56be9f6f00fb948c1d088291 Merge: b276f20 acfa560 Author: Paul W. Frields <stickster at gmail.com> Date: Mon Apr 15 12:26:01 2013 -0400 Merge branch 'el5' into el5 .gitignore | 1 + drupal6-filefield.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---