]> git.decadent.org.uk Git - nfs-utils.git/commitdiff
projects / nfs-utils.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e9ce0a8 3ccd5e6)
Merge branch 'upstream'
authorLuk Claes <luk@debian.org>
Sun, 2 Oct 2011 14:47:26 +0000 (16:47 +0200)
committerLuk Claes <luk@debian.org>
Sun, 2 Oct 2011 14:47:26 +0000 (16:47 +0200)
1  2 
.gitignore patch | diff1 | diff2 | blob | history

diff --cc .gitignore
Simple merge
Debian package of nfs-utils