« back to all changes in this revision
Viewing changes to serve-branches
- Committer: Michael Hudson
- Date: 2008-06-16 11:25:25 UTC
- mfrom: (160 trunk)
- mto: This revision was merged to the branch mainline in revision 164.
- Revision ID: michael.hudson@canonical.com-20080616112525-t1vsjh4s3knwpou3
merge trunk, rather brutally resolving conflicts
- files removed:
- loggerhead/textindex.py
- files modified:
- README.txt
added
removed
serve-branches
