Merge commit 'origin/master' into fusionax
authorStéphane Jacob <sj@m4x.org>
Fri, 28 Aug 2009 09:33:22 +0000 (11:33 +0200)
committerStéphane Jacob <sj@m4x.org>
Fri, 28 Aug 2009 09:33:22 +0000 (11:33 +0200)
commit3f5cf357e7ab02c9cbf616bc8cc3a70278af62cc
tree135c6ccacb2ff85cf45bb9b6f18bc18d33747b71
parentd392bbc4ae30229ca1881b25020f171e22e8cf4b
parent2839fc70fd4632ab22180792428b51607b361232
Merge commit 'origin/master' into fusionax
ChangeLog
modules/profile/page.inc.php