[IMP]: resolved all conflicts
[odoo/odoo.git] / addons / event_moodle / __init__.py
2012-01-31 MVA[MERGE] merge with new trunk