[boinc] 02/02: Merge branch 'pristine-tar' of git+ssh://git.debian.org/git/pkg-boinc/boinc into pristine-tar

[Steffen Möller]

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

moeller pushed a commit to branch pristine-tar
in repository boinc.

commit beb5840349e2a9f7d24f155258413b97b2dd8463
Merge: de10c50 dd6717a
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Sat Feb 15 14:47:09 2014 +0100

    Merge branch 'pristine-tar' of git+ssh://git.debian.org/git/pkg-boinc/boinc into pristine-tar
    
    Conflicts:
    	boinc_7.2.28+dfsg.orig.tar.gz.delta
    
    Just took Gianfranco's version to overcome the conflict.

 boinc_7.2.33+dfsg.orig.tar.gz.delta | Bin 0 -> 93687 bytes
 boinc_7.2.33+dfsg.orig.tar.gz.id    |   1 +
 2 files changed, 1 insertion(+)

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