[MERGE] branch merged with lp:openobject-addons
authorHemendra Paregi (Open ERP) <hpa@tinyerp.com>
Mon, 26 Dec 2011 10:16:53 +0000 (15:46 +0530)
committerHemendra Paregi (Open ERP) <hpa@tinyerp.com>
Mon, 26 Dec 2011 10:16:53 +0000 (15:46 +0530)
commit99ae0048d014f5aec3015e9d6838cdd8a89f5cff
treea2972a8bb80089e4fe0463ffae10d1727f792384
parentfd7c6686bb70bca2b8b3bb77694c8d051c62e20a
parent052223704b234c7370c34d3091fa9bf4f47b2165
[MERGE] branch merged with lp:openobject-addons

bzr revid: hpa@tinyerp.com-20111226101653-25ootep7adgfde7k