[jffi-1.2.7] 02/03: Merge branch 'master' of git://git.debian.org/git/pkg-java/jffi-1.2.7

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository jffi-1.2.7.

commit 775ba2075956dd64e3509aa1f57786fe854a9658
Merge: 15d006e 9c9ba92
Author: tony mancill <tmancill at debian.org>
Date:   Wed Jan 28 17:51:51 2015 -0800

    Merge branch 'master' of git://git.debian.org/git/pkg-java/jffi-1.2.7
    
    Conflicts:
    	debian/control

 debian/control   | 14 +-------------
 debian/copyright |  6 +++---
 2 files changed, 4 insertions(+), 16 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jffi-1.2.7.git