[sepia] 42/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 56072668ea42a4008c20c65d682d48fcbb4c677f
Merge: 6bd43d7 51d94f5
Author: Hilko Bengen <bengen at debian.org>
Date:   Sat Mar 19 18:22:37 2011 +0100

    Merge branch 'upstream'
    
    Conflicts:
    	sepia.info

 ChangeLog             |  191 +++++++++
 MANIFEST              |    6 +-
 META.yml              |   33 +-
 Makefile.PL           |  234 ++++++++++-
 README                |   42 +-
 Sepia.html            |  343 ++++++++++-----
 lib/Sepia.pm          | 1107 ++++++++++++++++++++++++++++++++++++++-----------
 lib/Sepia/CPAN.pm     |   31 +-
 lib/Sepia/Debug.pm    |   68 ++-
 lib/Sepia/ReadLine.pm |   38 ++
 lib/Sepia/Xref.pm     |   11 +-
 sepia-cpan.el         |   23 +-
 sepia-snippet.el      |   15 +-
 sepia-tree.el         |    1 +
 sepia-w3m.el          |   39 +-
 sepia.el              |  472 +++++++++++++--------
 sepia.texi            |  227 +++++++---
 sepl                  |   39 ++
 t/01basic.t           |    5 +-
 t/02completion.t      |   19 +-
 t/03without.t         |   27 ++
 t/testy.pl            |   22 +
 22 files changed, 2337 insertions(+), 656 deletions(-)


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