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)
commit8dda254648e0ebf8ba0e6a7b2d58acff730ada2c
treee37771cd27f66d67922f3e18eb71df4821d6483e
parent51fb3b6facb76baf990d0407baf9be4c669fffa7
parentb0612326f67425b4f755acd78a0eff1df0daccd4
Merge remote branch 'origin/platal-1.0.0'
templates/profile/profile.tpl