Index: /modules/branches/2.4/conferences/module.xml
===================================================================
--- /modules/branches/2.4/conferences/module.xml (revision 4805)
+++ /modules/branches/2.4/conferences/module.xml (revision 5167)
@@ -2,9 +2,10 @@
 	<rawname>conferences</rawname>
 	<name>Conferences</name>
-	<version>1.2.1.1</version>
+	<version>1.2.1.2</version>
 	<type>setup</type>
 	<category>Internal Options &amp; Configuration</category>
 	<description>Allow creation of conference rooms (meet-me) where multiple people can talk together.</description>
 	<changelog>
+		*1.2.1.2* add call to Macro(user-callerid) to get proper CID in Meetme Conference
 		*1.2.1.1* bump for rc1
 		*1.2.1* changed syntax error in meetme_additional.conf form '|' to ',' separator
Index: /modules/branches/2.4/conferences/functions.inc.php
===================================================================
--- /modules/branches/2.4/conferences/functions.inc.php (revision 3991)
+++ /modules/branches/2.4/conferences/functions.inc.php (revision 5167)
@@ -53,4 +53,5 @@
 				
 				// Start the conference
+				$ext->add($contextname, 'STARTMEETME', '', new ext_macro('user-callerid'));
 				$ext->add($contextname, 'STARTMEETME', '', new ext_meetme('${MEETME_ROOMNUM}','${MEETME_OPTS}','${PIN}'));
 				$ext->add($contextname, 'STARTMEETME', '', new ext_hangup(''));