diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-09-30 21:04:22 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-09-30 21:04:22 -0400 |
| commit | 85ec27ab5822d67788a6d13255d4929a789c4435 (patch) | |
| tree | faeaea185eee3756198ed6f00dc5cb54500b5ee8 /debian/rules | |
| parent | 2bfbad7af4e3e09287b4c06c958d0929c0c7bc63 (diff) | |
| parent | 0651e86a4c3e6f038b1362e33ea08235f046c102 (diff) | |
Merge branch 'master' into tova
Conflicts:
debian/changelog
Diffstat (limited to 'debian/rules')
0 files changed, 0 insertions, 0 deletions