Merge updates: education.
authorStéphane Jacob <sj@m4x.org>
Mon, 14 Nov 2011 13:36:03 +0000 (14:36 +0100)
committerStéphane Jacob <sj@m4x.org>
Mon, 14 Nov 2011 13:36:17 +0000 (14:36 +0100)
commita1430b3042e43ddc874abc2f6dd2e01a5d872a59
treecacc492c303267abf0261dff74d3a51c1333b69a
parent149360d4415a12797d7047995e9bcf608a4ced34
Merge updates: education.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
modules/fusionax/formation.pl
templates/fusionax/education.tpl