[MERGE] Sync with lp:openobject-addons.
authorParamjit Singh Sahota <psa@tinyerp.com>
Fri, 28 Jun 2013 05:16:07 +0000 (10:46 +0530)
committerParamjit Singh Sahota <psa@tinyerp.com>
Fri, 28 Jun 2013 05:16:07 +0000 (10:46 +0530)
commita5a676ced9c0f9029091941c815825121349bfef
tree178e16699299cfaff7bc275e1d8285a96e0efecf
parentbcadfb8383ecfcb8781116ab3bf8e77aef50ed31
parent53358465b32fb99295bf75a2a7ffd3f1d8157af6
[MERGE] Sync with lp:openobject-addons.

bzr revid: psa@tinyerp.com-20130628051607-zi0xzbmhe6kly35t