[X2Go-Commits] x2godesktopsharing.git - master (branch) updated: 3.1.0.6-7-g48bee65

[X2Go dev team]

The branch, master has been updated
       via  48bee654a304bd31aec090f2c3f4656f690a15e9 (commit)
      from  ecdee936ba5417aeab8e3528e1f9ec0847943922 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 48bee654a304bd31aec090f2c3f4656f690a15e9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Jun 8 01:08:28 2013 +0200

    release 3.1.0.7 (changelog update, cherry-picked from release/3.1.0.x branch)
    
    Conflicts (by Mike Gabriel):
    	debian/changelog

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c66c55e..526209d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,13 +11,13 @@ x2godesktopsharing (3.1.1.0-0~x2go1) UNRELEASED; urgency=low
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 10 Jan 2013 10:06:02 +0100
 
-x2godesktopsharing (3.1.0.7-0~x2go1) UNRELEASED; urgency=low
+x2godesktopsharing (3.1.0.7-0~x2go1) unstable; urgency=low
 
   [ Orion Poplawski ]
   * New upstream version (3.1.0.7):
     - Fix desktop file (Fixes: #118).
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 10 Jan 2013 10:06:02 +0100
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 08 Jun 2013 01:07:40 +0200
 
 x2godesktopsharing (3.1.0.6-0~x2go1) unstable; urgency=low
 


hooks/post-receive
-- 
x2godesktopsharing.git (Desktop Sharing for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2godesktopsharing.git" (Desktop Sharing for X2Go).