[drupal6-imagefield/el6: 3/3] Merge branch 'master' into el6

[Peter Borsa]

commit 0e3712e50b1c97bd15ed687d3017183c7b10069e
Merge: 7404ea8 34b7e9e
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Thu Nov 28 13:23:07 2013 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	drupal6-imagefield.spec
    	sources

 .gitignore              |    1 +
 drupal6-imagefield.spec |   12 ++++++++----
 sources                 |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
---