[Checkins] SVN: Products.PluggableAuthService/branches/shh-16-masquerading/ Merged revisions 102148-102149 via svnmerge from

[Andreas Zeidler]

Log message for revision 102150:
  Merged revisions 102148-102149 via svnmerge from 
  svn+ssh://svn.zope.org/repos/main/Products.PluggableAuthService/branches/shh-15-masquerading
  
  ........
    r102148 | witsch | 2009-07-23 16:27:48 +0200 (Thu, 23 Jul 2009) | 2 lines
    
    backport r102144:r102145 to the 1.5 branch
  ........
    r102149 | witsch | 2009-07-23 16:31:59 +0200 (Thu, 23 Jul 2009) | 2 lines
    
    revert r102148 and use `setup.cfg` ftw
  ........
  

Changed:
  _U  Products.PluggableAuthService/branches/shh-16-masquerading/
  U   Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/version.txt
  A   Products.PluggableAuthService/branches/shh-16-masquerading/setup.cfg

-=-

Property changes on: Products.PluggableAuthService/branches/shh-16-masquerading
___________________________________________________________________
Modified: svnmerge-integrated
   - /Products.PluggableAuthService/branches/shh-15-masquerading:1-97445,97447-102134,102137-102140 /Products.PluggableAuthService/branches/1.6:1-102136
   + /Products.PluggableAuthService/branches/shh-15-masquerading:1-97445,97447-102134,102137-102149 /Products.PluggableAuthService/branches/1.6:1-102136

Modified: Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/version.txt
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/version.txt	2009-07-23 14:31:59 UTC (rev 102149)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/Products/PluggableAuthService/version.txt	2009-07-23 14:36:01 UTC (rev 102150)
@@ -1 +1 @@
-1.6.2dev-jarn.masquerading.1
+1.6.2dev

Copied: Products.PluggableAuthService/branches/shh-16-masquerading/setup.cfg (from rev 102149, Products.PluggableAuthService/branches/shh-15-masquerading/setup.cfg)
===================================================================
--- Products.PluggableAuthService/branches/shh-16-masquerading/setup.cfg	                        (rev 0)
+++ Products.PluggableAuthService/branches/shh-16-masquerading/setup.cfg	2009-07-23 14:36:01 UTC (rev 102150)
@@ -0,0 +1,3 @@
+[egg_info]
+tag_build = -jarn.masquerading
+tag_svn_revision = true