Merged changes from jdong's branch into HEAD.

[selectricity] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
old mode 100755 (executable)
new mode 100644 (file)
index 50c7c5b..1e24ca1
--- a/.bzrignore
+++ b/.bzrignore
@@ -5,3 +5,4 @@ server.log
 test.log
 tmp
 public/engine_files
+.DS_Store