automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@73511 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 2 insertions, 0 deletions

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 85a770932..f62f77fb4 100644
--- a/channels/chan_sip.c
+++ b/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;