[amavisd-new/el6: 10/10] Merge remote branch 'origin/master' into el6

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



commit f79ab9aa9664097baa2291b0d33762acd06c35b4
Merge: 366067a 8b41b6a
Author: Robert Scheck <robert@xxxxxxxxxxxxxxxxx>
Date:   Fri Feb 22 02:18:21 2013 +0100

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	amavisd-new.spec

 .gitignore                |    2 +-
 amavisd-conf.patch        |   76 ++++++++++++++++------
 amavisd-new-tmpfiles.conf |    2 +
 amavisd-new.spec          |  158 ++++++++++++++++++++++++++++-----------------
 sources                   |    2 +-
 5 files changed, 157 insertions(+), 83 deletions(-)
---
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel



[Index of Archives]     [Fedora Announce]     [Fedora Kernel]     [Fedora Testing]     [Fedora Legacy Announce]     [Fedora PHP Devel]     [Kernel Devel]     [Fedora Legacy]     [Fedora Maintainers]     [Fedora Desktop]     [PAM]     [Red Hat Development]     [Big List of Linux Books]     [Gimp]     [Yosemite Information]
  Powered by Linux