Changeset 1d7e681 for debian/control

Timestamp:
Jun 29, 2010, 1:20:47 AM (15 years ago)
Author:
Jessica B. Hamrick <jhamrick@…>
Branches:
debian
Children:
25ed065
Parents:
634455f (diff), 6157f97 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Jessica B. Hamrick <jhamrick@…> (06/29/10 01:20:47)
git-committer:
Jessica B. Hamrick <jhamrick@…> (06/29/10 01:20:47)
Message:

Merge branch 'master' into debian

Conflicts:

.gitignore

File:
1 added

Note: See TracChangeset for help on using the changeset viewer.