Merge branch 'master' of git+ssh://leroi.g@repo.or.cz/srv/git/seam-carving
commit77b8e118fb97253b339fe46ee593ad39aef8e599
authorGuillaume Leroi <leroi.g@gmail.com>
Mon, 10 Dec 2007 22:40:05 +0000 (10 23:40 +0100)
committerGuillaume Leroi <leroi.g@gmail.com>
Mon, 10 Dec 2007 22:40:05 +0000 (10 23:40 +0100)
treea4427b20206c919fd68238980cc845e30392c37a
parentb34128171e26a3f8c8edb92a731f82e36e4179a8
parent7a7c2d7a35706a35ff905735f79074374f948f7a
Merge branch 'master' of git+ssh://leroi.g@repo.or.cz/srv/git/seam-carving