Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 12 Sep 2013 20:59:03 +0000 (22:59 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 12 Sep 2013 20:59:03 +0000 (22:59 +0200)
commit154ecc9117291889ed20b392e65725f883a2d962
tree11f070e62ddfceccb7a8703ac1eb7e82b88ae3b4
parenta77f3c4e1c594c492d3e7b4aea870f0f03426d3a
parent6e3e832f22b2a14bcb7f01839b70a2e4d0713025
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

Conflicts:
citadel/modules/network/serv_network.c
citadel/modules/smtp/serv_smtp.c
citadel/modules/smtp/smtp_util.c
citadel/modules/network/serv_netspool.c
citadel/modules/rssclient/serv_rssclient.c
citadel/modules/smtp/serv_smtp.c
citadel/modules/smtp/smtp_util.c