[boinc] 02/04: Merge tag 'upstream/7.6.21+dfsg'

[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 3efd27ad9a64346a3569bb3632d1ad33597f2245
Merge: 11fa729 5ad0bcc
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Dec 16 19:06:41 2015 +0100

    Merge tag 'upstream/7.6.21+dfsg'
    
    Upstream version 7.6.21+dfsg

 android/BOINC/AndroidManifest.xml     |   4 +-
 clientgui/AccountInfoPage.cpp         |   2 +-
 clientgui/BOINCGUIApp.cpp             |  28 --
 clientgui/BOINCGUIApp.h               |   2 -
 clientgui/sg_TaskPanel.cpp            |  21 +-
 configure.ac                          |   2 +-
 lib/diagnostics.cpp                   |  49 ++-
 lib/diagnostics.h                     |   1 -
 lib/diagnostics_win.cpp               |  31 --
 locale/ca/BOINC-Manager.mo            | Bin 79688 -> 79705 bytes
 locale/ca/BOINC-Manager.po            | 322 +++++++--------
 locale/de/BOINC-Web.mo                | Bin 37160 -> 37299 bytes
 locale/de/BOINC-Web.po                | 717 +++++++++++++++++-----------------
 locale/el/BOINC-Manager.mo            | Bin 78271 -> 78272 bytes
 locale/el/BOINC-Manager.po            |   2 +-
 locale/it_IT/BOINC-Client.mo          | Bin 5012 -> 5012 bytes
 locale/it_IT/BOINC-Manager.mo         | Bin 79561 -> 79739 bytes
 locale/it_IT/BOINC-Manager.po         |  48 +--
 locale/it_IT/BOINC-Project-Generic.po |   2 +-
 locale/it_IT/BOINC-Web.mo             | Bin 36762 -> 36762 bytes
 version.log                           |   2 +-
 21 files changed, 624 insertions(+), 609 deletions(-)

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