[MERGE] merge from trunk addons
[odoo/odoo.git] / addons / wiki_faq /
drwxr-xr-x   ..
-rwxr-xr-x 1045 __init__.py
-rwxr-xr-x 1445 __openerp__.py
drwxr-xr-x - i18n
-rwxr-xr-x 2824 wiki_faq.xml