8 Commits

Author SHA1 Message Date
Alex
2e462e04d5 Resolve conflicts
All "confilcts" were actually diffs - not sure why git flew off the
handle.
2013-01-12 14:27:50 -06:00
Alex
2e69817ccf merge develop into master 2013-01-10 23:55:10 -06:00
alex
161ea4ec18 unbundled build fixes 2013-01-05 00:04:09 -06:00
Guenter Obiltschnig
f73934cd32 fixed line endings 2012-11-11 14:08:47 +01:00
Guenter Obiltschnig
79eab26377 the great line endings cleanup 2012-11-11 09:57:01 +01:00
Marian Krivos
144817e28c backport SMTPLogger 2012-06-26 12:33:34 +00:00
Aleksandar Fabijanic
f9b60296f7 removing old trunk files 2012-04-23 00:43:14 +00:00
Aleksandar Fabijanic
5f7122d21b SMTPChannel and SMTPLogger example 2008-01-23 02:43:09 +00:00