[Pkg-sugar-commit] [sugar-record-activity] 08/09: Merge tag 'upstream/102'

[Jonas Smedegaard]

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

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

commit ffe3ef0ca81cff8aa40c5ed5686d965ee374caca
Merge: f0a1878 cb63c94
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Sep 14 20:47:25 2015 +0200

    Merge tag 'upstream/102'
    
    Upstream version 102
    
    # gpg: Signature made man 14 sep 2015 20:44:52 CEST
    # gpg:                using RSA key 0x2C7C3146C1A00121
    # gpg: checking the trustdb
    # gpg: 3 marginal(s) needed, 1 complete(s) needed, PGP trust model
    # gpg: depth: 0  valid:   2  signed: 137  trust: 0-, 0q, 0n, 0m, 0f, 2u
    # gpg: depth: 1  valid: 137  signed: 222  trust: 124-, 0q, 0n, 8m, 5f, 0u
    # gpg: depth: 2  valid: 107  signed: 142  trust: 107-, 0q, 0n, 0m, 0f, 0u
    # gpg: next trustdb check due at 2015-09-16
    # 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 +-
 glive.py               |  4 +++-
 hw.py                  | 29 ++++++++++++++++++++++++-----
 record.py              | 10 ++++++++++
 4 files changed, 38 insertions(+), 7 deletions(-)

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