Merge remote branch 'origin/platal-1.0.0'
authorStéphane Jacob <sj@m4x.org>
Tue, 27 Jul 2010 14:46:17 +0000 (16:46 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 27 Jul 2010 14:46:17 +0000 (16:46 +0200)
1  2 
templates/profile/profile.tpl

Simple merge