[SCM] Samba Website Repository - branch master updated

[John Terpstra]

The branch, master has been updated
       via  65da244 Merge branch 'master' of git+ssh://git.samba.org/data/git/samba-web
       via  688cd5b Updated Lingora entry.
      from  757be53 devel: Update description of v4-0-x branches.

http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 65da24451a7c3fd6a2664a26d8eec9d4db0f074b
Merge: 688cd5b778e7663ab1834390bf707efa7dbbe9e1 757be53fe778f8acba92952a45fba2f6b1cb4a4d
Author: John H Terpstra <jht at samba.org>
Date:   Fri Nov 2 21:52:39 2012 -0500

    Merge branch 'master' of git+ssh://git.samba.org/data/git/samba-web

commit 688cd5b778e7663ab1834390bf707efa7dbbe9e1
Author: John H Terpstra <jht at samba.org>
Date:   Thu Nov 1 23:07:42 2012 -0500

    Updated Lingora entry.

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

Summary of changes:
 support/france.html |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/support/france.html b/support/france.html
index 2079e04..3c26409 100644
--- a/support/france.html
+++ b/support/france.html
@@ -113,12 +113,12 @@ applications libres performantes sécurisées,
 <hr />
 <h3>LINAGORA SA</h3>
 <pre><small>
-LINAGORA SA
-27 rue de Berri, 
-75008 PARIS
+Linagora S.A.
+80 rue Roque de Fillol
+Puteaux 92800 F
 
 <a href="http://www.linagora.com/">www.linagora.com</a>
-+33 1 58 18 68 28
++33 (0)1 46 96 63 63
 <a href="mailto:info at linagora.com">info at linagora.com</a>
 </small></pre>
 <p>


-- 
Samba Website Repository