[drupal7-feeds/f17: 4/4] Merge branch 'master' into f17

[Peter Borsa]

commit 90ffb20f08568e3cf1902c2c1946966e22910874
Merge: 6e95096 0183235
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Wed Oct 10 20:44:45 2012 +0200

    Merge branch 'master' into f17
    
    Conflicts:
    	sources

 .gitignore         |    1 +
 drupal7-feeds.spec |   10 ++++++++--
 sources            |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---