Changeset 4068ed9 for debian

Timestamp:
Jul 6, 2010, 12:08:40 AM (14 years ago)
Author:
Jessica B. Hamrick <jhamrick@…>
Branches:
debian
Children:
7009a01
Parents:
31d7856 (diff), 0d02eca (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@…> (07/06/10 00:08:40)
git-committer:
Jessica B. Hamrick <jhamrick@…> (07/06/10 00:08:40)
Message:

Merge branch 'master' into debian

Conflicts:

.gitignore

Location:
debian
Files:
29 added

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