Fix bad merge
[cascardo/ema.git] / AUTHORS
2008-07-02 Lincoln de Sousaadding authors and copying files