summaryrefslogtreecommitdiff
path: root/.bzr/checkout/conflicts
Commit message (Expand)AuthorAgeFilesLines
* Add autoinstall directiveHenrik Rydberg2008-11-161-1/+0
* Importing 0.10.2 to GITHenrik Rydberg2008-11-151-0/+1