[Pkg-mozext-commits] [status-4-evar] 06/06: Merge remote-tracking branch 'alioth/master'

[Ximin Luo]

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

infinity0-guest pushed a commit to branch master
in repository status-4-evar.

commit d11f6426b8f9474966a35de022830de64f035d60
Merge: c668cc7 0055109
Author: Ximin Luo <infinity0 at pwned.gg>
Date:   Sun Mar 29 19:04:55 2015 +0200

    Merge remote-tracking branch 'alioth/master'
    
    Conflicts:
    	debian/watch

 debian/watch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/status-4-evar.git