[Pkg-sugar-commit] [sugar-toolkit] 09/13: Merge commit 'upstream/0.84.15' 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.15-1
in repository sugar-toolkit.

commit e35f875b93b0e4cf65398523efa3c20f202504d3
Merge: 0bf8eda e7d705f
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Dec 5 10:45:37 2010 +0100

    Merge commit 'upstream/0.84.15' into master-0.84

 configure                           |  20 ++---
 configure.ac                        |   2 +-
 src/sugar/activity/bundlebuilder.py |   8 +-
 src/sugar/bundle/Makefile.am        |   1 +
 src/sugar/bundle/Makefile.in        |   1 +
 src/sugar/bundle/activitybundle.py  |  13 ++-
 src/sugar/bundle/bundleversion.py   | 157 ++++++++++++++++++++++++++++++++++++
 src/sugar/bundle/contentbundle.py   |  10 ++-
 8 files changed, 191 insertions(+), 21 deletions(-)

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