deleted:    Library/Formula/.gitignore_bk
	modified:   Library/Formula/autoconf.rb
	modified:   Library/Formula/gettext.rb
	modified:   Library/Formula/libffi.rb
	modified:   Library/Taps/homebrew-science (modified content)
	Library/Formula/.gitignore
Merge branch 'linuxbrew' of https://github.com/sennychu/lbrew into linuxbrew

* 'linuxbrew' of https://github.com/sennychu/lbrew:
  Update autoconf.rb

Conflicts:
	Library/Formula/autoconf.rb

	deleted:    Library/Formula/autoconf.rb
	Library/Formula/.gitignore
	new file:   Library/Formula/.gitignore
	new file:   Library/Formula/autoconf.rb
	modified:   Library/Taps/homebrew-science (modified content)