Merge pull request #2006 from civicrm/4.3
authorcolemanw <coleman@civicrm.org>
Sun, 17 Nov 2013 01:06:39 +0000 (17:06 -0800)
committercolemanw <coleman@civicrm.org>
Sun, 17 Nov 2013 01:06:39 +0000 (17:06 -0800)
commitfeb07870854e6e0081670f2fe33faf579b737eba
tree3c3d61e1625e058f7719b87bffa3a8d0a3d16077
parent321745fe6969c68a13f77ba3af3d6687eeeaa130
parentd46561f5cd7b839682c59255b24d25dcfd6eb607
Merge pull request #2006 from civicrm/4.3

Merge branch 4.3 into 4.4
CRM/Core/Session.php
templates/CRM/common/print.tpl
templates/CRM/common/snippet.tpl