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
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
Merge branch 'master' into RELEASE_20130723