[MERGE] merge with lp:openobject-addons
authorAjay Chauhan (OpenERP) <cha@tinyerp.com>
Thu, 8 Nov 2012 05:15:40 +0000 (10:45 +0530)
committerAjay Chauhan (OpenERP) <cha@tinyerp.com>
Thu, 8 Nov 2012 05:15:40 +0000 (10:45 +0530)
commit324589ec74bc0b6a6bf5653cd5b0f684509ff38f
tree42eeaadd300e2bb779d5cfc9fd1a664a1ec95b1c
parent0ede04eb0ca8a1b570105d79b27fc87d3d29fc49
parent1a8ef8657b2e84df951872bb7c814c129f2591dc
[MERGE] merge with lp:openobject-addons

bzr revid: cha@tinyerp.com-20121108051540-gttui88frpzhetdx