[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Fri, 6 Jul 2012 04:33:27 +0000 (10:03 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Fri, 6 Jul 2012 04:33:27 +0000 (10:03 +0530)
commit091323081e8d6dbda6a87bd235cf41b498f54127
tree9f75a6406c52c2a20eb67eb7e1747b7d474d8af4
parente1b443993261fe5f7d6459d2f31ca45cc53a5a26
parenta3a9594ae59e92adab841ff4dc53ea18edacea51
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120706043327-6ggghraqlkaj1op1