[Pkg-sugar-commit] [sugar-toolkit] 07/13: Merge commit 'v0.84.15' into upstream-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 386682cc28fe0f3eac0d442d0dd67ecf7d3660a7
Merge: 4413237 f28f282
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Dec 5 10:43:55 2010 +0100

    Merge commit 'v0.84.15' into upstream-0.84

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

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