John Goerzen 2378f6b68e Merge branch '620nmu' ... Conflicts: debian/changelog		2010-06-29 16:50:33 -05:00
..
changelog	Merge branch '620nmu'	2010-06-29 16:50:33 -05:00
compat	* Bump debhelper compatibility level to 6 — no changes required.	2008-03-05 17:09:46 +01:00
control	Merge branch '620nmu'	2010-06-29 16:50:33 -05:00
copyright	Update copyright	2009-08-12 00:41:42 -05:00
dirs	* Remove empty /usr/sbin directory from package.	2008-03-05 17:11:47 +01:00
docs	Removed old reference to README	2009-07-01 21:01:20 -05:00
pyversions	Fix minimum Python version. Closes: #535481.	2009-07-02 00:03:05 -05:00
rules	Imported Debian version 6.2.0+nmu2	2010-06-29 16:49:52 -05:00