[boinc] 05/07: Merge branch 'upstream'

[Steffen Möller]

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

moeller pushed a commit to branch master
in repository boinc.

commit 394a2ae0ae47af9e05d39d6727db7ae373ccb7f7
Merge: 9b37b2a bf227ee
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Sun Feb 16 04:35:55 2014 +0100

    Merge branch 'upstream'


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