[Pkg-sugar-commit] [sugar-browse-activity] 04/10: Merge tag 'upstream/157.2'

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository sugar-browse-activity.

commit 603618513b3e7d78a94fdc5d3b20a131b91fb3cc
Merge: aad14c1 9991aa1
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Jul 3 16:10:02 2015 -0500

    Merge tag 'upstream/157.2'
    
    Upstream version 157.2
    
    # gpg: Signature made fre 03 jul 2015 16:09:59 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]"

 activity/activity.info | 2 +-
 downloadmanager.py     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

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