Revision 5ff742790105ef8364f5c83db8191f1d49404bd5

Committed on 19/01/2016 7:56 am by Luca Realdi <luca.realdi@opencontent.it> [GitHub Diff]

Merge branch 'temp_nardelli' into mastedevr

Conflicts:
classes/abstractexporter.php
modules/exportas/module.php