automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@73511 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

@@ -1942,6 +1942,8 @@ static int create_addr_from_peer(struct sip_pvt *r, struct sip_peer *peer)
 		ast_copy_string(r->fromdomain, peer->fromdomain, sizeof(r->fromdomain));
 	if (!ast_strlen_zero(peer->fromuser))
 		ast_copy_string(r->fromuser, peer->fromuser, sizeof(r->fromuser));
+	if (!ast_strlen_zero(peer->language))
+		ast_copy_string(r->language, peer->language, sizeof(r->language));
 	r->maxtime = peer->maxms;
 	r->callgroup = peer->callgroup;
 	r->pickupgroup = peer->pickupgroup;