Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-30-11-58-01
authorkurund <kurund@civicrm.org>
Mon, 30 Jun 2014 06:28:11 +0000 (11:58 +0530)
committerkurund <kurund@civicrm.org>
Mon, 30 Jun 2014 06:28:11 +0000 (11:58 +0530)

Trivial merge