From: Tim Otten <totten@civicrm.org>
Date: Sat, 16 Nov 2013 10:29:03 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-16-02-28-05
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6b253248d872e1d7576d16b836e619ca07e52ccb;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-16-02-28-05

Conflicts:
	css/civicrm.css
---

6b253248d872e1d7576d16b836e619ca07e52ccb
diff --cc css/civicrm.css
index 78f36da8e4,8615c68ddc..31a165c46f
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@@ -4032,6 -4032,6 +4032,10 @@@ span.crm-status-icon 
    color: #fff;
  }
  
 +.crm-container .paper-icon {
 +  background-position: -101px -222px;background-image: url("../i/icons/jquery-ui-3E3E3E.gif");
- }
++}
++
+ .crm-container .survey-completed {
+   text-decoration: line-through;
+ }