Merge branch 'unstable'

jackdempsey · May 1, 2012 · a273769 · a273769
2 parents 044910a + 80ba748
commit a273769
Show file tree

Hide file tree

Showing 88 changed files with 5,952 additions and 2,648 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,7 @@ Thumbs.db
 nbproject
 *.sublime-project
 *.sublime-workspace
+queue.txt
 
 # Komodo
 *.komodoproject
@@ -30,4 +31,5 @@ nbproject
 .hg
 .svn
 .CVS
-.idea
+.idea
+queue