[boinc] 05/05: Merge remote-tracking branch 'origin/master'

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch master
in repository boinc.

commit 3c875bfae85b941da5f458115d02f42e9787bbb2
Merge: 846cb4a c11996a
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue May 3 20:41:12 2016 +0200

    Merge remote-tracking branch 'origin/master'

 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

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