[MERGE]: merging from the same branch

bzr revid: vmt@openerp.com-20091125095036-klz8sos8eey5urnp
This commit is contained in:
Mantavya Gajjar
2009-11-25 15:20:36 +05:30
committed by Vo Minh Thu
parent ccfe97090b
commit 7e098c3fa9
+1 -1
View File
@@ -19,7 +19,7 @@
#
##############################################################################
{
"name" : "Base",
"name" : "Base - Password Encryption",
"version" : "1.0",
"author" : "FS3 , Review Tiny",
"website" : "http://www.openerp.com",