[Pkg-sugar-commit] [sugar] 04/05: Merge tag 'upstream/0.106.0'

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository sugar.

commit 2c521740e1756094e6fa30b5e5f0a71dc6c5f15f
Merge: 0903e9b 43a8d0e
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jul 6 20:56:53 2015 -0500

    Merge tag 'upstream/0.106.0'
    
    Upstream version 0.106.0
    
    # gpg: Signature made man 06 jul 2015 20:56:49 PET
    # gpg:                using RSA key 0x2C7C3146C1A00121
    # gpg: Good signature from "Jonas Smedegaard <dr at jones.dk>"
    # gpg:                 aka "Jonas Smedegaard <jonas at homebase.dk>"
    # gpg:                 aka "Jonas Smedegaard <js at debian.org>"
    # gpg:                 aka "[jpeg image of size 4165]"

 configure                             | 22 +++++++++++-----------
 configure.ac                          |  4 ++--
 src/jarabe/journal/journalactivity.py | 23 ++++++++++++++++++++++-
 3 files changed, 35 insertions(+), 14 deletions(-)

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