[boinc-app-seti] 02/02: Merge remote-tracking branch 'alioth/master'

[Guo Yixuan]

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

yixuan-guest pushed a commit to branch master
in repository boinc-app-seti.

commit c61a19d95d3fe7311304ace9f3fa0107e4a40952
Merge: 66945eb 9cbff63
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Wed Feb 26 12:43:57 2014 -0500

    Merge remote-tracking branch 'alioth/master'
    
    Resolved an inconsistency in git history.
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

 debian/changelog               | 13 +++++++++--
 debian/patches/fix-armhf.patch | 51 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 3 files changed, 63 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc-app-seti.git