[SCM] ciderwebmail Debian packaging branch, master, updated. debian/1.04_20120607-1-8-g5190c52

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit e8d4c80d312820828aa6d3330baad455f3324c64
Merge: 79198d5db3b8a015859ad6ca70dcf8414d960227 de0ab9315bb2c794fc26d189cf955956fd5235ab
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jun 10 19:38:20 2012 +0200

    Merge tag 'upstream/1.04_20120610'
    
    Upstream version 1.04~20120610
    # gpg: Signature made søn 10 jun 2012 19:38:14 CEST using RSA key ID C1A00121
    # gpg: please do a --check-trustdb
    # 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 "Jonas Smedegaard <jonas at dgi-huset.dk>"
    # gpg:                 aka "Jonas Smedegaard <jonas at 107b.dk>"
    # gpg:                 aka "[jpeg image of size 4165]"

diff --combined .gitignore
index 55b539a,af8e53e..0a64659
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,3 +1,4 @@@
 +/.pc
  /blib
  /Makefile
  /Makefile.old
@@@ -6,3 -5,4 +6,4 @@@
  /inc
  /pm_to_blib
  /runtests
+ /root/var/user_settings.sql

-- 
ciderwebmail Debian packaging