Update formula.rb
	modified:   .gitignore
	new file:   Library/Caches/Homebrew/source
	new file:   Library/Formula/abiword.rb
	new file:   Library/Formula/adol-c.rb
	new file:   Library/Formula/ann.rb
	new file:   Library/Formula/armadillo.rb
	new file:   Library/Formula/bact.rb
	new file:   Library/Formula/bali-phy.rb
	new file:   Library/Formula/bedtools.rb
	new file:   Library/Formula/cdo.rb
	new file:   Library/Formula/cminpack.rb
	new file:   Library/Formula/colpack.rb
	new file:   Library/Formula/exonerate.rb
	new file:   Library/Formula/fann.rb
	new file:   Library/Formula/field3d.rb
	new file:   Library/Formula/flann.rb
	new file:   Library/Formula/glpk.rb
	new file:   Library/Formula/gmt.rb
	new file:   Library/Formula/h5utils.rb
	new file:   Library/Formula/hdf5.rb
	new file:   Library/Formula/igraph.rb
	new file:   Library/Formula/insighttoolkit.rb
	new file:   Library/Formula/libmatio.rb
	new file:   Library/Formula/mafft.rb
	new file:   Library/Formula/mallet.rb
	new file:   Library/Formula/mame.rb
	new file:   Library/Formula/mathgl.rb
	new file:   Library/Formula/mathomatic.rb
	new file:   Library/Formula/maxima.rb
	new file:   Library/Formula/mcl.rb
	new file:   Library/Formula/metis.rb
	new file:   Library/Formula/minc.rb
	new file:   Library/Formula/mpsolve.rb
	new file:   Library/Formula/nauty.rb
	new file:   Library/Formula/ncview.rb
	new file:   Library/Formula/netcdf.rb
	new file:   Library/Formula/octave.rb
	new file:   Library/Formula/opencv.rb
	new file:   Library/Formula/openimageio.rb
	new file:   Library/Formula/openmeeg.rb
	new file:   Library/Formula/pastix.rb
	new file:   Library/Formula/pnapi.rb
	new file:   Library/Formula/pulseaudio.rb
	new file:   Library/Formula/qhull.rb
	new file:   Library/Formula/qt-mobility.rb
	new file:   Library/Formula/r.rb
	new file:   Library/Formula/radx.rb
	new file:   Library/Formula/rom-tools.rb
	new file:   Library/Formula/root.rb
	new file:   Library/Formula/scotch.rb
	new file:   Library/Formula/suite-sparse.rb
	new file:   Library/Formula/symphony.rb
	new file:   Library/Formula/triangle.rb
	new file:   Library/Formula/unafold.rb
	new file:   Library/Formula/vcftools.rb
	new file:   Library/Formula/vips.rb
	new file:   Library/Formula/vtk.rb
	new file:   Library/Formula/wxmaxima.rb
	new file:   Library/Formula/xorg-server.rb
	modified:   Library/LinkedKegs/coreutils
	modified:   Library/Taps/homebrew-games
	modified:   Library/Taps/homebrew-science
	modified:   Library/Taps/homebrew-versions
	modified:   Library/Taps/homebrew-dupes (modified content)
	modified:   Library/Taps/homebrew-science (modified content)
Merge branch 'master' into linuxbrew

* master:
  modified:   .gitignore 	new file:   Library/Caches/Homebrew/source 	new file:   Library/Formula/abiword.rb 	new file:   Library/Formula/adol-c.rb 	new file:   Library/Formula/ann.rb 	new file:   Library/Formula/armadillo.rb 	new file:   Library/Formula/bact.rb 	new file:   Library/Formula/bali-phy.rb 	new file:   Library/Formula/bedtools.rb 	new file:   Library/Formula/cdo.rb 	new file:   Library/Formula/cminpack.rb 	new file:   Library/Formula/colpack.rb 	new file:   Library/Formula/exonerate.rb 	new file:   Library/Formula/fann.rb 	new file:   Library/Formula/field3d.rb 	new file:   Library/Formula/flann.rb 	new file:   Library/Formula/glpk.rb 	new file:   Library/Formula/gmt.rb 	new file:   Library/Formula/h5utils.rb 	new file:   Library/Formula/hdf5.rb 	new file:   Library/Formula/igraph.rb 	new file:   Library/Formula/insighttoolkit.rb 	new file:   Library/Formula/libmatio.rb 	new file:   Library/Formula/mafft.rb 	new file:   Library/Formula/mallet.rb 	new file:   Library/Formula/mame.rb 	new file:   Library/Formula/mathgl.rb 	new file:   Library/Formula/mathomatic.rb 	new file:   Library/Formula/maxima.rb 	new file:   Library/Formula/mcl.rb 	new file:   Library/Formula/metis.rb 	new file:   Library/Formula/minc.rb 	new file:   Library/Formula/mpsolve.rb 	new file:   Library/Formula/nauty.rb 	new file:   Library/Formula/ncview.rb 	new file:   Library/Formula/netcdf.rb 	new file:   Library/Formula/octave.rb 	new file:   Library/Formula/opencv.rb 	new file:   Library/Formula/openimageio.rb 	new file:   Library/Formula/openmeeg.rb 	new file:   Library/Formula/pastix.rb 	new file:   Library/Formula/pnapi.rb 	new file:   Library/Formula/pulseaudio.rb 	new file:   Library/Formula/qhull.rb 	new file:   Library/Formula/qt-mobility.rb 	new file:   Library/Formula/r.rb 	new file:   Library/Formula/radx.rb 	new file:   Library/Formula/rom-tools.rb 	new file:   Library/Formula/root.rb 	new file:   Library/Formula/scotch.rb 	new file:   Library/Formula/suite-sparse.rb 	new file:   Library/Formula/symphony.rb 	new file:   Library/Formula/triangle.rb 	new file:   Library/Formula/unafold.rb 	new file:   Library/Formula/vcftools.rb 	new file:   Library/Formula/vips.rb 	new file:   Library/Formula/vtk.rb 	new file:   Library/Formula/wxmaxima.rb 	new file:   Library/Formula/xorg-server.rb 	modified:   Library/LinkedKegs/coreutils 	modified:   Library/Taps/homebrew-games 	modified:   Library/Taps/homebrew-science 	modified:   Library/Taps/homebrew-versions 	modified:   Library/Taps/homebrew-dupes (modified content) 	modified:   Library/Taps/homebrew-science (modified content)
  Update formula.rb

Conflicts:
	.git/MERGE_HEAD