Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-30-11-03-32

author kurund <kurund@civicrm.org>

Mon, 30 Dec 2013 19:03:36 +0000 (11:03 -0800)

committer kurund <kurund@civicrm.org>

Mon, 30 Dec 2013 19:03:36 +0000 (11:03 -0800)
author kurund <kurund@civicrm.org>
Mon, 30 Dec 2013 19:03:36 +0000 (11:03 -0800)
committer kurund <kurund@civicrm.org>
Mon, 30 Dec 2013 19:03:36 +0000 (11:03 -0800)
diff --cc CRM/Contact/Form/Edit/CommunicationPreferences.php
Simple merge
diff --cc CRM/Core/Session.php
Simple merge
diff --cc xml/templates/civicrm_navigation.tpl
Simple merge
author	kurund <kurund@civicrm.org>
	Mon, 30 Dec 2013 19:03:36 +0000 (11:03 -0800)
committer	kurund <kurund@civicrm.org>
	Mon, 30 Dec 2013 19:03:36 +0000 (11:03 -0800)
		1	2
CRM/Contact/Form/Edit/CommunicationPreferences.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Core/Session.php	patch \|	diff1 \|	diff2 \|	blob \| history
xml/templates/civicrm_navigation.tpl	patch \|	diff1 \|	diff2 \|	blob \| history