modified:   Library/Formula/automake.rb
Merge branch 'linuxbrew' of https://github.com/sennychu/linuxbrew into linuxbrew

Conflicts:
	Library/Formula/automake.rb

	modified:   Library/Formula/automake.rb