]> git.decadent.org.uk Git - nfs-utils.git/commitdiff
Merge branch 'upstream'
authorLuk Claes <luk@debian.org>
Sat, 9 Jul 2011 10:23:15 +0000 (12:23 +0200)
committerLuk Claes <luk@debian.org>
Sat, 9 Jul 2011 10:23:15 +0000 (12:23 +0200)
1  2 
.gitignore

diff --cc .gitignore
Simple merge