Merge commit 'origin/master' into fusionax
authorStéphane Jacob <jacou@melix.net>
Thu, 21 Aug 2008 18:51:20 +0000 (20:51 +0200)
committerStéphane Jacob <jacou@melix.net>
Thu, 21 Aug 2008 18:51:20 +0000 (20:51 +0200)
commitf497128a7c26c25a64e05453ea479520149e2cb7
tree8cca8f683750cb8e6f7f63a70f760f256f3b7673
parent22f0a0a857bc6ba3fedb543f580af5bc7a45ab42
parent460d8f5533ac4dff9d0df95efe11c399228b8637
Merge commit 'origin/master' into fusionax

Conflicts:

htdocs/xorg.php
htdocs/xorg.php
modules/profile.php
modules/search.php