From 359de858b4c6e890e8ff2532f3be2d86270845f8 Mon Sep 17 00:00:00 2001
From: Kevin Chugh <kevinchugh@gmail.com>
Date: Wed, 20 Mar 2013 09:21:51 -0400
Subject: [PATCH] merge master

---
 lms/templates/discussion/mustache/_inline_thread.mustache        | 1 +
 .../discussion/mustache/_inline_thread_cohorted.mustache         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lms/templates/discussion/mustache/_inline_thread.mustache b/lms/templates/discussion/mustache/_inline_thread.mustache
index b52d3924e7..2fce7b0a00 100644
--- a/lms/templates/discussion/mustache/_inline_thread.mustache
+++ b/lms/templates/discussion/mustache/_inline_thread.mustache
@@ -1,4 +1,5 @@
 <article class="discussion-article" data-id="{{id}}">
+<div class="pinned-{{pinned}}"></div>
     <div class="thread-content-wrapper"></div>
 
     <ol class="responses post-extended-content">
diff --git a/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache b/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache
index 9223dfd388..6bc1f1f5fe 100644
--- a/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache
+++ b/lms/templates/discussion/mustache/_inline_thread_cohorted.mustache
@@ -1,5 +1,6 @@
 <article class="discussion-article" data-id="{{id}}">
 <div class="group-visibility-label">{{group_string}}</div>
+<div class="pinned-{{pinned}}"></div>
     <div class="thread-content-wrapper"></div>
 
     <ol class="responses post-extended-content">