Merge

2012-01-26 19:04:02 -05:00
parent 79c1cf19a0 978752ad98
commit 3eceb8a920
1 changed files with 1 additions and 0 deletions
--- a/.hgignore
+++ b/.hgignore
@@ -1,6 +1,7 @@
 syntax: glob
 *.pyc
 *~
+*.DS_Store
 database.sqlite
 courseware/static/js/mathjax/*
 db.newaskbot