sthen e7d0856ba7 add conflict marker		2014-06-03 14:28:40 +00:00
..
patches	- Update john to 1.8.0.	2013-05-31 06:01:59 +00:00
pkg	add conflict marker	2014-06-03 14:28:40 +00:00
distinfo	- Update john to 1.8.0.	2013-05-31 06:01:59 +00:00
Makefile	add conflict marker	2014-06-03 14:28:40 +00:00