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

commit 61ef49890cbfb94acd9eb65b5640b46572aeedd0
Merge: 28d4ad8 39c4e31
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Aug 10 11:13:01 2010 -0400

    Merge commit 'upstream/0.84.12' into master-0.84

 configure                        | 20 ++++++++++----------
 configure.ac                     |  2 +-
 po/nl.po                         | 16 +++++++++++-----
 src/sugar/datastore/datastore.py |  8 +++++---
 4 files changed, 27 insertions(+), 19 deletions(-)

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