]> git.ipfire.org Git - people/ms/dma.git/commitdiff
projects / people / ms / dma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 804be35 f5c64bf)
Merge commit 'refs/merge-requests/4' of git://gitorious.org/dma/dma
authorSimon Schubert <2@0x2c.org>
Tue, 15 Nov 2011 21:46:55 +0000 (22:46 +0100)
committerSimon Schubert <2@0x2c.org>
Tue, 15 Nov 2011 21:46:55 +0000 (22:46 +0100)
1  2 
crypto.c patch | diff1 | diff2 | blob | history

diff --cc crypto.c
Simple merge
Michael's tree of the Dragonfly Mail Agent