[sepia] 31/63: Merge branch 'upstream'

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository sepia.

commit 1fe1fd21dbee2d48e86055ed1afc53bd4e34dedf
Merge: 08874ec 7c40379
Author: Hilko Bengen <bengen at debian.org>
Date:   Mon Jun 23 22:45:33 2008 +0200

    Merge branch 'upstream'
    
    Conflicts:
    
    	.gitignore
    	META.yml
    	Sepia.html

 MANIFEST    |   1 +
 MANIFEST.in |  16 ----
 META.yml    |   2 +-
 Sepia.html  | 275 +++++++++++++++---------------------------------------------
 package.sh  |   7 --
 5 files changed, 70 insertions(+), 231 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/sepia.git