summaryrefslogtreecommitdiff
path: root/Debian
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-07-15 09:50:47 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-07-15 09:50:47 -0400
commitd92a7906608dcf6c697e912f73376c7f6b030fa8 (patch)
treec93b14ad35563c0f172101311db1ea688eca2903 /Debian
parentfba7d9e67576b17ed5eb4da99e5d1882549b5985 (diff)
parent452b7e6a61be42b2c345cdeeb00fbe51f88fce32 (diff)
Merge branch 'master' into buildsystems
Conflicts: debian/changelog
Diffstat (limited to 'Debian')
0 files changed, 0 insertions, 0 deletions