[Pkg-sugar-commit] [sugar-toolkit] 115/118: Merge commit 'upstream/0.84.10' 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 6ce8b798b17f31fd177e9e78d6786a4d27565e43
Merge: bc5012d 7fd9e8d
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Jun 25 19:46:33 2010 +0200

    Merge commit 'upstream/0.84.10' into master-0.84

 configure                        | 20 ++++++++++----------
 configure.ac                     |  2 +-
 src/sugar/activity/activity.py   | 17 ++++++-----------
 src/sugar/datastore/datastore.py |  4 ++--
 4 files changed, 19 insertions(+), 24 deletions(-)

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