Index: stable/7/share/man/man4/ciss.4
===================================================================
--- stable/7/share/man/man4/ciss.4	(revision 179999)
+++ stable/7/share/man/man4/ciss.4	(revision 180000)

Property changes on: stable/7/share/man/man4/ciss.4
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,1 +0,0 ##
   Reverse-merged /head/share/man/man4/ciss.4:r173081,179705,179903
Index: stable/7/share/man/man4
===================================================================
--- stable/7/share/man/man4	(revision 179999)
+++ stable/7/share/man/man4	(revision 180000)

Property changes on: stable/7/share/man/man4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,1 +0,1 ##
   Reverse-merged /head:r179705
   Merged /head/share/man/man4:r179705