[exodus] 38/48: Merge branch 'dfsg'

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository exodus.

commit f418ec9b2f9de07727726ef6e58c36ad003508c7
Merge: ac982c9 5ae7c58
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Dec 14 18:33:09 2013 +0000

    Merge branch 'dfsg'

 exodus/forbind/src/exo_jack.c | 4168 +++++++++++++++++++++++++++++++++++++++++
 nemesis/forbind/ne_jack.c     | 1438 ++++++++++++++
 2 files changed, 5606 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/exodus.git