[Pkg-sugar-commit] [sugar-presence-service] 04/09: Merge commit 'upstream/0.84.1' into master-0.84

[Jonas Smedegaard]

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

js pushed a commit to annotated tag debian/0.84.1-1
in repository sugar-presence-service.

commit e34b7e537eb7f41439c1f9ebd32431481c87690d
Merge: dd95086 d609063
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Jun 25 19:24:12 2010 +0200

    Merge commit 'upstream/0.84.1' into master-0.84
    
    Conflicts (use files from pristine tarball):
    	Makefile.in
    	aclocal.m4
    	configure
    	install-sh
    	missing
    	py-compile
    	src/Makefile.in
    	src/config.py

 Makefile.in     |  305 +++++++----
 aclocal.m4      |  325 +++++++----
 configure       | 1642 ++++++++++++++++++++++++++++++++-----------------------
 configure.ac    |    2 +-
 install-sh      |  517 ++++++++++++------
 missing         |  104 ++--
 py-compile      |   36 +-
 src/Makefile.in |  292 ++++++----
 src/activity.py |    2 +
 src/config.py   |    2 +-
 10 files changed, 2016 insertions(+), 1211 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-presence-service.git