From a6d336dd0e2391060aff454dc92a5210e833fd30 Mon Sep 17 00:00:00 2001
From: Your Name <kevinchugh@edx.org>
Date: Mon, 11 Feb 2013 13:55:55 -0500
Subject: [PATCH] merger master

---
 .redcar/lucene/segments.gen         | Bin 20 -> 20 bytes
 .redcar/lucene_last_updated         |   2 +-
 .redcar/storage/cursor_saver.yaml   |  38 +++++++++++++++-------------
 .redcar/storage/project_loader.yaml |   6 +++++
 .redcar/storage/sessions.yaml       |  10 ++++----
 .redcar/tags                        |   2 +-
 6 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/.redcar/lucene/segments.gen b/.redcar/lucene/segments.gen
index 8eb04a2d8ab80699610350e290b91e8a1214aa08..b23bb816f291877f50a59422e5cc56ca0f29ebb6 100644
GIT binary patch
literal 20
RcmezW|NlP*Fkp6q(Ev<w1cm?r

literal 20
RcmezW|NlP*Fkp6o(Ev<c1cCqn

diff --git a/.redcar/lucene_last_updated b/.redcar/lucene_last_updated
index a37d983253..294baca3d2 100644
--- a/.redcar/lucene_last_updated
+++ b/.redcar/lucene_last_updated
@@ -1 +1 @@
-1360365490
+1360522550
diff --git a/.redcar/storage/cursor_saver.yaml b/.redcar/storage/cursor_saver.yaml
index 4e51681cf7..86873915e5 100644
--- a/.redcar/storage/cursor_saver.yaml
+++ b/.redcar/storage/cursor_saver.yaml
@@ -144,9 +144,6 @@ cursor_positions:
   - :path: lms/templates/discussion/mustache/_inline_thread.mustache
     :cursor_offset: 54
     :timestamp: 2013-02-05 22:15:01 -05:00
-  - :path: common/static/coffee/src/discussion/discussion_module_view.coffee
-    :cursor_offset: 2796
-    :timestamp: 2013-02-06 17:12:07 -05:00
   - :path: lms/templates/discussion/_underscore_templates.html
     :cursor_offset: 1315
     :timestamp: 2013-02-06 17:31:19 -05:00
@@ -162,11 +159,6 @@ cursor_positions:
   - :path: lms/templates/index.html
     :cursor_offset: 0
     :timestamp: 2013-01-25 15:31:55 -05:00
-  - :path: lms/djangoapps/django_comment_client/forum/views.py
-    :cursor_offset: 9415
-    :timestamp: 2013-02-06 21:34:16 -05:00
-    :selection_offset: 9420
-    :block_selection_mode: false
   - :path: lms/djangoapps/django_comment_client/base/views.py
     :cursor_offset: 1716
     :timestamp: 2013-02-06 18:25:59 -05:00
@@ -175,9 +167,6 @@ cursor_positions:
     :timestamp: 2013-02-06 17:12:09 -05:00
     :selection_offset: 8672
     :block_selection_mode: false
-  - :path: common/static/coffee/src/discussion/views/new_post_view.coffee
-    :cursor_offset: 727
-    :timestamp: 2013-02-06 21:58:14 -05:00
   - :path: lms/templates/discussion/index.html
     :cursor_offset: 408
     :timestamp: 2012-12-10 23:45:38 -05:00
@@ -187,9 +176,6 @@ cursor_positions:
   - :path: lms/templates/discussion/_inline.html
     :cursor_offset: 318
     :timestamp: 2012-12-10 23:45:38 -05:00
-  - :path: lms/templates/discussion/mustache/_inline_discussion.mustache
-    :cursor_offset: 1994
-    :timestamp: 2013-02-07 19:39:13 -05:00
   - :path: common/static/coffee/src/discussion/views/new_post_inline_vew.coffee
     :cursor_offset: 917
     :timestamp: 2013-02-06 17:12:07 -05:00
@@ -212,9 +198,25 @@ cursor_positions:
   - :path: lms/templates/discussion/_thread_list_template.html
     :cursor_offset: 1257
     :timestamp: 2013-02-08 15:40:40 -05:00
+  - :path: lms/templates/discussion/mustache/_inline_discussion.mustache
+    :cursor_offset: 796
+    :timestamp: 2013-02-08 10:34:44 -05:00
+  - :path: common/static/coffee/src/discussion/discussion_module_view.coffee
+    :cursor_offset: 2564
+    :timestamp: 2013-02-08 12:47:34 -05:00
+  - :path: lms/djangoapps/django_comment_client/forum/views.py
+    :cursor_offset: 1005
+    :timestamp: 2013-02-08 16:18:50 -05:00
+  - :path: lms/static/sass/_discussion.scss
+    :cursor_offset: 19732
+    :timestamp: 2013-02-08 17:38:08 -05:00
+  - :path: lms/templates/discussion/_filter_dropdown.html
+    :cursor_offset: 491
+    :timestamp: 2013-02-08 17:00:15 -05:00
+  - :path: common/static/coffee/src/discussion/views/new_post_view.coffee
+    :cursor_offset: 2600
+    :timestamp: 2013-02-07 10:06:26 -05:00
   - :path: common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
-    :cursor_offset: 10449
-    :timestamp: 2013-02-08 17:21:06 -05:00
-    :selection_offset: 10438
-    :block_selection_mode: false
+    :cursor_offset: 10896
+    :timestamp: 2013-02-08 18:18:10 -05:00
 files_to_retain: 0
diff --git a/.redcar/storage/project_loader.yaml b/.redcar/storage/project_loader.yaml
index 8f6791a3da..1795ea4693 100644
--- a/.redcar/storage/project_loader.yaml
+++ b/.redcar/storage/project_loader.yaml
@@ -1,3 +1,9 @@
 --- 
 open_files: 
+  - lms/templates/discussion/mustache/_inline_discussion.mustache
+  - common/static/coffee/src/discussion/discussion_module_view.coffee
   - lms/djangoapps/django_comment_client/forum/views.py
+  - lms/static/sass/_discussion.scss
+  - lms/templates/discussion/_filter_dropdown.html
+  - common/static/coffee/src/discussion/views/new_post_view.coffee
+  - common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
diff --git a/.redcar/storage/sessions.yaml b/.redcar/storage/sessions.yaml
index 143c9ac482..18c8a7bcf0 100644
--- a/.redcar/storage/sessions.yaml
+++ b/.redcar/storage/sessions.yaml
@@ -1,7 +1,7 @@
 --- 
 bounds: 
-  x: 0
-  y: 22
-  width: 1366
-  height: 742
-tree_width: 394
+  x: 65
+  y: 24
+  width: 1857
+  height: 1085
+tree_width: 436
diff --git a/.redcar/tags b/.redcar/tags
index ea17c8ba43..d2076d8e02 100644
--- a/.redcar/tags
+++ b/.redcar/tags
@@ -1,4 +1,4 @@
-1360365490
+1360522550
 Ammeter	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function Ammeter(x,y,rotation,color,offset)
 B	/home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js	function B()
 B	/home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js	function B(){var b=false;try{var c=m.location.search;return (c.indexOf(U)!=-1||(c.indexOf(V)!=-1||m.external&&m.external.gwtOnLoad))&&c.indexOf(W)==-1}catch(a){}B=function()