]> err.no Git - util-linux/commitdiff
Merge remote branch 'origin/stable/v2.17' into stable/v2.17
authorLaMont Jones <lamont@debian.org>
Sat, 15 May 2010 15:33:07 +0000 (09:33 -0600)
committerLaMont Jones <lamont@debian.org>
Sat, 15 May 2010 15:33:07 +0000 (09:33 -0600)
1  2 
debian/control

diff --cc debian/control
Simple merge