Mercurial > hg > decoupage
diff setup.py @ 55:47acf12d01e1
merge commit
| author | Jeff Hammel <jhammel@mozilla.com> |
|---|---|
| date | Thu, 18 Nov 2010 08:19:06 -0800 |
| parents | ac693b8df32c |
| children | 1275124ed767 |
| author | Jeff Hammel <jhammel@mozilla.com> |
|---|---|
| date | Thu, 18 Nov 2010 08:19:06 -0800 |
| parents | ac693b8df32c |
| children | 1275124ed767 |