[zaptel-commits] branch kpfleming/version-tag - commit revision 869

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Fri Dec 16 20:27:15 2005
New Revision: 869

URL: http://svn.digium.com/view/zaptel?rev=869&view=rev
Log:
fix merge property

Modified:
    team/kpfleming/version-tag/   (props changed)

Propchange: team/kpfleming/version-tag/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Dec 16 20:27:15 2005
@@ -1,1 +1,1 @@
-/trunk:864
+/trunk:1-864