Merge branch 'master' of github.com:bulldog2011/bigqueue

Conflicts: .gitignore
bulldog2011 · Jan 22, 2013 · 5829be5 · 5829be5
2 parents 5504d77 31bffde
commit 5829be5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/README.md b/README.md
@@ -0,0  1,4 @@
 bigqueue
 ========
 
 A big, fast and persistent queue implemented in java.