[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter tag, upstream/3.9.1_rc1+git20110729.ae3fad4+dfsg, created. upstream/3.9.1_rc1+git20110729.ae3fad4-5-gafe36a4

[Julien Valroff]

The tag, upstream/3.9.1_rc1+git20110729.ae3fad4+dfsg has been created
        at  afe36a4425aaf0dd7e95fe2709361a61aba7486d (commit)

- Shortlog ------------------------------------------------------------
commit afe36a4425aaf0dd7e95fe2709361a61aba7486d
Merge: 158e8cf b5a87fc
Author: Julien Valroff <julien at kirya.net>
Date:   Sat Jul 30 07:32:07 2011 +0200

    Merge branch 'upstream' into dfsg_clean
    
    Conflicts:
    	contrib/OutlookAddin/DLL/README
    	contrib/OutlookAddin/DSpamAddin.sln
    	contrib/OutlookAddin/Engine/Engine.csproj
    	contrib/OutlookAddin/Engine/GUI/AktionForm.Designer.cs
    	contrib/OutlookAddin/Engine/GUI/AktionForm.cs
    	contrib/OutlookAddin/Engine/GUI/AktionForm.resx
    	contrib/OutlookAddin/Engine/GUI/MainForm.Designer.cs
    	contrib/OutlookAddin/Engine/GUI/MainForm.cs
    	contrib/OutlookAddin/Engine/GUI/MainForm.resx
    	contrib/OutlookAddin/Engine/GUI/TrainingForm.Designer.cs
    	contrib/OutlookAddin/Engine/GUI/TrainingForm.cs
    	contrib/OutlookAddin/Engine/GUI/TrainingForm.resx
    	contrib/OutlookAddin/Engine/Konfiguration.cs
    	contrib/OutlookAddin/Engine/Language.cs
    	contrib/OutlookAddin/Engine/Logger.cs
    	contrib/OutlookAddin/Engine/Parser/KonfigurationParser.cs
    	contrib/OutlookAddin/Engine/Parser/LanguageParser.cs
    	contrib/OutlookAddin/Engine/Parser/MailParser.cs
    	contrib/OutlookAddin/Engine/Properties/AssemblyInfo.cs
    	contrib/OutlookAddin/Engine/Properties/Resources.Designer.cs
    	contrib/OutlookAddin/Engine/Properties/Resources.resx
    	contrib/OutlookAddin/Engine/Resources/folder.bmp
    	contrib/OutlookAddin/Engine/TODO.txt
    	contrib/OutlookAddin/Engine/Worker.cs
    	contrib/OutlookAddin/Engine/en-US.xml
    	contrib/OutlookAddin/OutlookInterface/AssemblyInfo.cs
    	contrib/OutlookAddin/OutlookInterface/Connect.cs
    	contrib/OutlookAddin/OutlookInterface/OutlookInterface.csproj
    	contrib/OutlookAddin/OutlookInterface/OutlookInterfaceSetup/OutlookInterfaceSetup.vdproj
    	contrib/OutlookAddin/_LANG/Languages.de-DE.resources
    	contrib/OutlookAddin/_LANG/Languages.en-US.resources
    	contrib/OutlookAddin/_LANG/Languages.fr-FR.resources
    	contrib/OutlookAddin/_LANG/Languages.pt-PT.resources
    	contrib/OutlookAddin/_LANG/de-DE.xml
    	contrib/OutlookAddin/_LANG/en-US.xml
    	contrib/OutlookAddin/_LANG/fr-FR.xml
    	contrib/OutlookAddin/_LANG/pt-PT.xml
    	contrib/OutlookAddin/simpleConsole/Program.cs
    	contrib/OutlookAddin/simpleConsole/Properties/AssemblyInfo.cs
    	contrib/OutlookAddin/simpleConsole/simpleConsole.csproj

-----------------------------------------------------------------------

-- 
Debian packages for the DSPAM anti-spam filter