Merge branch 'master' of git@github.com:macournoyer/thin

macournoyer · May 26, 2008 · 7aab41a · 7aab41a
2 parents 44d6ce7 + 23c86d9
commit 7aab41a
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,5 @@ tmp/*
 pkg/*
 nbproject/*
 .DS_Store
+daemon_test.log