[ciderwebmail] 02/04: Merge tag 'upstream/1.05' into experimental

[Jonas Smedegaard]

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

js pushed a commit to branch experimental
in repository ciderwebmail.

commit e05ea057c806ce6384e4db1a65b6824cdd50f8f7
Merge: a66b1ca 2876fea
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Oct 25 02:31:41 2014 +0200

    Merge tag 'upstream/1.05' into experimental
    
    Upstream version 1.05
    
    # gpg: Underskrift lavet lør 25 okt 2014 02:31:37 CEST
    # gpg:                bruger RSA nøgle 0x4EC1B722374F9BD6
    # gpg: udfør venligst en --check-trustdb
    # gpg: God underskrift fra »Jonas Smedegaard <dr at jones.dk>« [ultimativ]
    # gpg:        også kendt som »Jonas Smedegaard <jonas at homebase.dk>« [ultimativ]
    # gpg:        også kendt som »Jonas Smedegaard <js at debian.org>« [ultimativ]
    # gpg:        også kendt som »[jpeg image of size 4165]« [ultimativ]

 root/static/scripts/base.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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