add merge_dup_medium_all_controversies to support web ui merge media; fix bug in spider feed generation
Merge branch 'master' of github.com:berkmancenter/mediacloud
sql typo
removed SVN support in pre-commit hooks
proper FCGI dependency
numbered comment lines in "cpanfile" in order for it to get sorted properly
C locale ordering of "cpanfile" lines
wrap everything in an eval to avoid rare die() errors from xml treebuilder stuff
Merge branch 'master' of github.com:berkmancenter/mediacloud
overwrite existing file if it already exists
improved error message
print controversy label on stderr
fix trayvon feedproxy stories
add media and story merging to ui
chop title at 1024 characters to avoid postgres index error
dedup stories
fix logic bug in dedup_stories that left dup_stories undeduped
Merge branch 'master' of github.com:berkmancenter/mediacloud into solr_and_hadoop_integration