Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-30-11-03-32
authorkurund <kurund@civicrm.org>
Mon, 30 Dec 2013 19:03:36 +0000 (11:03 -0800)
committerkurund <kurund@civicrm.org>
Mon, 30 Dec 2013 19:03:36 +0000 (11:03 -0800)
commit86d6172a4e2d39cd119eead245fcb31106b66972
tree3da4119efb9e03828b4faa3cba50db51563ddbf2
parentc2449f9f690ced66b17a98cc94e2abb6df62206d
parent72c9c889e2ab828c9026c40b6407535d5a371f8f
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-30-11-03-32
CRM/Contact/Form/Edit/CommunicationPreferences.php
CRM/Core/Session.php
xml/templates/civicrm_navigation.tpl