Eitan Adler 0ab43263c7 Update the merging chapter and explain the new merging policy. ... Reviewed by: peter		2013-12-07 23:00:33 +00:00
..
article.xml	Update the merging chapter and explain the new merging policy.	2013-12-07 23:00:33 +00:00
Makefile	- Rename .sgml files to .xml	2012-10-01 09:53:01 +00:00