Also merge implementations from local file.
commitbae487bf6d54fbddb267e81e9509e20e9479184d
authorThomas Leonard <talex5@gmail.com>
Mon, 2 Jan 2006 21:21:55 +0000 (2 21:21 +0000)
committerThomas Leonard <talex5@gmail.com>
Mon, 2 Jan 2006 21:21:55 +0000 (2 21:21 +0000)
treec61b1672eb7376d7ee10ba0bd16e217387f4b98f
parent510564f370ec61f9ddc2ca4a950583a31e97de5a
Also merge implementations from local file.

git-svn-id: file:///home/talex/Backups/sf.net/Subversion/zero-install/injector/0publish@634 9f8c893c-44ee-0310-b757-c8ca8341c71e
0publish
merge.py [new file with mode: 0644]