diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-17 08:22:43 -0700 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-17 08:22:43 -0700 |
| commit | dcd208513d24c609719065c51eb176f6b0df3024 (patch) | |
| tree | 035865be9e0812fb5e01d8abadb5159d924966e5 /Makefile | |
| parent | 95bfbcd3e3952dc1e22fbc313394c54c3ababad4 (diff) | |
| parent | fe8fee235b11e58cfda7e8a09e120b0daabe3f43 (diff) | |
Merge branch 'master' into assistant
Conflicts:
debian/changelog
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions