Aman Gupta 2564f30af1 Merge remote-tracking branch 'origin/master' into brew2deb-backports ... Conflicts: lib/fpm/target/deb.rb		2011-07-07 23:57:48 -07:00
..
fpm	Make bin/fpm executable	2011-07-07 23:28:16 -07:00
fpm-npm	removed all trailing whitespace: for i in $(git ls-files); do sed -i tmp -e "s/ *$//" $i; done	2011-07-07 22:52:55 -07:00