Permalink
Browse files

Merge branch 'master' of https://github.com/twitter/gizzard into bird…

…cage

Conflicts:
	project/build.properties
	project/build/GizzardProject.scala
	project/release.properties
  • Loading branch information...
2 parents 0c721c2 + 78e78be commit c4ff052ce8a10675c97625b1d20b9d8aede6cd66 Sumeet Lahorani committed Apr 13, 2012
Showing with 0 additions and 0 deletions.

0 comments on commit c4ff052

Please sign in to comment.