From 1bea71a4594628745af0ade8dac2fd78ff0a805e Mon Sep 17 00:00:00 2001
From: Bridger Maxwell <bridger@mit.edu>
Date: Thu, 26 Jan 2012 12:13:51 -0500
Subject: [PATCH 1/2] Added ignore for DS_Store files.

---
 .hgignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgignore b/.hgignore
index 25ea59bf0a..bac3960bb8 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,6 +1,7 @@
 syntax: glob
 *.pyc
 *~
+*.DS_Store
 database.sqlite
 courseware/static/js/mathjax/*
 db.newaskbot

From 978752ad9845200b18e40cca6ed3f691d0307a7d Mon Sep 17 00:00:00 2001
From: Bridger Maxwell <bridger@mit.edu>
Date: Thu, 26 Jan 2012 19:02:38 -0500
Subject: [PATCH 2/2] The default is now the new askbot. Switch over.

---
 settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.py b/settings.py
index 57b3227b1f..f42725e7f1 120000
--- a/settings.py
+++ b/settings.py
@@ -1 +1 @@
-settings_old_askbot.py
\ No newline at end of file
+settings_new_askbot.py
\ No newline at end of file