commit e480101fcb5b3bd00d224f6dcffbf8662098e515 Merge: 90ffb20 d361616 Author: Jared K. Smith <jsmith at fedoraproject.org> Date: Thu Oct 25 17:17:59 2012 -0400 Merge branch 'master' into f17 .gitignore | 1 + drupal7-feeds.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) ---