[MERGE]:merged from lp:openobject-addons
authorapa-tiny <apa@tinyerp.com>
Tue, 12 Oct 2010 07:40:03 +0000 (13:10 +0530)
committerapa-tiny <apa@tinyerp.com>
Tue, 12 Oct 2010 07:40:03 +0000 (13:10 +0530)
commit6e5253bbca09f8de78cb0b7e730282187c230da8
tree04eadd24b63354076b9101c2ba46af1ffa98abd9
parentdf8e2eae6e337f708cdbdfaf2eafe2ceac696e70
parentaf6d14b9c42796f4a423ca49851e0d72e457c6bc
[MERGE]:merged from lp:openobject-addons

bzr revid: apa@tinyerp.com-20101012074003-dgfqqjuwabgchyxg