Index: stable/12
===================================================================
--- stable/12	(revision 340999)
+++ stable/12	(revision 341000)

Property changes on: stable/12
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r340273,340275,340295,340303