Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-18-19-02-17
authorkurund <kurund@civicrm.org>
Mon, 18 Nov 2013 13:32:24 +0000 (19:02 +0530)
committerkurund <kurund@civicrm.org>
Mon, 18 Nov 2013 13:32:24 +0000 (19:02 +0530)

Trivial merge