[Pkg-sugar-commit] [sugar-toolkit] 85/118: Merge commit 'upstream/0.84.8' 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.10-1
in repository sugar-toolkit.

commit 1f31ec7c440357f1a16defdefe29b877d7735cea
Merge: 8d20dc6 109427d
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Feb 8 19:59:10 2010 +0100

    Merge commit 'upstream/0.84.8' into master-0.84

 configure                      | 20 ++++++++++----------
 configure.ac                   |  2 +-
 src/sugar/activity/activity.py |  3 ---
 src/sugar/activity/main.py     |  7 +++++++
 4 files changed, 18 insertions(+), 14 deletions(-)

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