[libmousex-nativetraits-perl] 02/06: Merge branch 'temp'

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository libmousex-nativetraits-perl.

commit 95e35913a8b647853d8714d30861d0a776f52b0c
Merge: 3cffe8c fa65f0b
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Jan 3 02:23:01 2014 +0100

    Merge branch 'temp'
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 14 +++++---------
 debian/control   |  2 +-
 debian/copyright |  1 +
 3 files changed, 7 insertions(+), 10 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmousex-nativetraits-perl.git