[Xfce4-commits] <www:master> Merge branch 'master' of ssh://git.xfce.org/git/www/www.xfce.org

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to f81d197ecb63e0649b45bb39d500ab3086d6320d (commit)
       from 83ca0e6247a034e25e8bf7e2809e4415b6ccda65 (commit)

commit f81d197ecb63e0649b45bb39d500ab3086d6320d
Merge: 83ca0e6 c663d8c
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Mon Nov 22 13:35:46 2010 +0100

    Merge branch 'master' of ssh://git.xfce.org/git/www/www.xfce.org

commit c663d8ca80fa4f7b1c4b8c4f9122db563fc5429e
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Nov 7 19:26:14 2010 +0100

    Another shot.

commit f1fe1c75e88c488f6cf8c21498b129058727d835
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Nov 7 19:19:14 2010 +0100

    Another try.

commit 7b9c6be5c9ec31a4d6453816e9e382cf6ebfa512
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Nov 7 19:17:55 2010 +0100

    Test commit.

 module.xml |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/module.xml b/module.xml
index 8b6e652..0afc8da 100644
--- a/module.xml
+++ b/module.xml
@@ -25,5 +25,4 @@
       <gnome:userid>nick</gnome:userid>
     </foaf:Person>
   </developer>
-
 </Project>