[Pkg-sugar-commit] [sugar] 08/10: Merge tag 'upstream/0.106.1'

[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 fe5083bc1a5d8fa0cf4f7bc1a67f4c8fc6ac3707
Merge: d6598b6 0c11f9a
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Sep 14 16:30:43 2015 +0200

    Merge tag 'upstream/0.106.1'
    
    Upstream version 0.106.1
    
    # gpg: Signature made man 14 sep 2015 16:28:58 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: 106  signed: 141  trust: 106-, 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]"

 configure                              | 22 +++++++++++-----------
 configure.ac                           |  4 ++--
 extensions/cpsection/language/model.py |  1 +
 src/jarabe/intro/window.py             |  5 +++--
 src/jarabe/journal/model.py            | 10 +++++-----
 src/jarabe/model/filetransfer.py       | 11 +++++++++--
 src/jarabe/view/viewhelp.py            |  2 +-
 7 files changed, 32 insertions(+), 23 deletions(-)

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