mergetrunk
authorFabien Pinckaers <fp@tinyerp.com>
Thu, 9 Aug 2012 15:01:58 +0000 (17:01 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Thu, 9 Aug 2012 15:01:58 +0000 (17:01 +0200)
commit7d375fa5c69c4865de3e2d30831c606bd3ccd42b
tree2402ade0c3ed95c7a84fcf2c70807277cb33f8ae
parent93f47bb8368066a26211ae106975cadd3c52a9f8
parent966d48ae023dbb0d5feaddfca05967363ffae367
mergetrunk

bzr revid: fp@tinyerp.com-20120809150158-dvvdfejd0tjfbhk5