Martin Wilke b5e6166534 - Update CONFLICT handling ... Submitted by: beat Review by: bcr, jkois		2010-12-30 06:24:10 +00:00
..
articles	- Add new contributor Mickael Maillot for multimedia/xbmc	2010-12-29 20:44:12 +00:00
books	- Update CONFLICT handling	2010-12-30 06:24:10 +00:00
captions	Another pass of human edited transcripts made for hire through Amazon	2010-03-08 06:42:08 +00:00
flyer
share	Remove redundant LI (langage-independent) parts of freebsd.dsl in	2010-12-08 06:26:00 +00:00
slides
Makefile