Merge from trunk

apps/app_voicemail.c

@@ -3013,7 +3013,10 @@ static void prep_email_sub_vars(struct ast_channel *ast, struct ast_vm_user *vmu
 	snprintf(passdata, passdatasize, "%d", msgnum);
 	pbx_builtin_setvar_helper(ast, "VM_MSGNUM", passdata);
 	pbx_builtin_setvar_helper(ast, "VM_CONTEXT", context);
-	pbx_builtin_setvar_helper(ast, "VM_MAILBOX", mailbox);
+	/* Manwe let's set E164 to VM_MAILBOX and create a new var VM_UUID*/
+	pbx_builtin_setvar_helper(ast, "VM_MAILBOX", vmu->dialed_num);
+	pbx_builtin_setvar_helper(ast, "VM_UUID", mailbox);
+	/* End Manwe */
 	pbx_builtin_setvar_helper(ast, "VM_CALLERID", (!ast_strlen_zero(cidname) || !ast_strlen_zero(cidnum)) ?
 		ast_callerid_merge(callerid, sizeof(callerid), cidname, cidnum, NULL) : "an unknown caller");
 	pbx_builtin_setvar_helper(ast, "VM_CIDNAME", (!ast_strlen_zero(cidname) ? cidname : "an unknown caller"));

debian/changelog

@@ -1,3 +1,11 @@
+ngcp-asterisk (1.4.24.1-rsp+svn4100.3) unstable; urgency=low
+
+  [ jbonilla ]
+  * voicemail: Export main E164 number as VM_MAILBOX
+  * voicemail: Export UUID as VM_UUID
+
+ -- Jon Bonilla <jbonilla@sipwise.com>  Mon, 04 Jun 2012 15:44:19 +0100
+
 ngcp-asterisk (1.4.24.1-rsp+svn4100.2) unstable; urgency=low
 
   [ mprokop ]