Merge pull request #2111 from sebastianbergmann/master
commit39a0d45681b1404e19427f8cdd214c273d0a601d
authorJosh Watzman <jwatzman@jwatzman.org>
Thu, 20 Mar 2014 20:14:21 +0000 (20 13:14 -0700)
committerJosh Watzman <jwatzman@jwatzman.org>
Thu, 20 Mar 2014 20:14:21 +0000 (20 13:14 -0700)
tree02e278a5117363308348586612ac6580caf36cc3
parent1f8d718cbaae4a43a2d6c3ec78be288242a1ba02
parente83056b6fbb06a78f65f9eb1b32517be260f2c10
Merge pull request #2111 from sebastianbergmann/master

Ignore hphp/hack/Makefile