[boinc] 02/07: Merge branch 'upstream' of git+ssh://git.debian.org/git/pkg-boinc/boinc into 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 bf227ee34aec8981ddd27a8a5a4e0bb60fe384c2
Merge: 15237e0 954008b
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Sun Feb 16 01:54:45 2014 +0100

    Merge branch 'upstream' of git+ssh://git.debian.org/git/pkg-boinc/boinc into upstream

 client/client_state.cpp              |  7 +++----
 client/gui_rpc_server_ops.cpp        | 22 ++++++++++------------
 clientgui/BOINCInternetFSHandler.cpp | 14 +++-----------
 configure.ac                         |  2 +-
 lib/gui_rpc_client.cpp               | 24 ++++++++++++++++++------
 5 files changed, 35 insertions(+), 34 deletions(-)

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