[MERGE] merging Jame's fixes

knewter · Feb 10, 2009 · 4d093ad · 4d093ad
2 parents ee2a465 + 32933f4
commit 4d093ad
Show file tree

Hide file tree

Showing 10 changed files with 182 additions and 770 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 config/database.yml
+config/database.yml.bak
 log/
 log/*
 *.swp