Mustufa Rangwala 7855c94a38 [MERGE] merge from trunk addons ... bzr revid: mra@mra-laptop-20110106132240-r5v7aj1wcobrrhqk bzr revid: mra@mra-laptop-20110107050329-14m4tm4c3g531a65		2011-01-07 10:33:29 +05:30
..
i18n	[MERGE] merge from trunk addons	2011-01-06 13:22:12 +05:30
security	merged with trunk	2010-12-30 15:28:09 +05:30
web	merged with trunk	2010-12-30 15:28:09 +05:30
wizard	merged with trunk	2010-12-30 15:28:09 +05:30
__init__.py	merged with trunk	2010-12-30 15:28:09 +05:30
__openerp__.py	merged with trunk	2010-12-30 15:28:09 +05:30
res_users.py	merged with trunk	2010-12-30 15:28:09 +05:30
res_users_view.xml	merged with trunk	2010-12-30 15:28:09 +05:30
share_demo.xml	merged with trunk	2010-12-30 15:28:09 +05:30
share_view.xml	[MERGE] merge from trunk addons	2011-01-07 10:33:29 +05:30