merge_trunk
authorFabien Pinckaers <fp@tinyerp.com>
Fri, 13 Jul 2012 11:53:45 +0000 (13:53 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Fri, 13 Jul 2012 11:53:45 +0000 (13:53 +0200)
commitd0f53bea684c05b432a1e93beb0e80ebdde21315
treeff7327b1c9bbef36476180cf086aa965bd1b62de
parent1a4bd20eafcafcc62adc413cea3bcbef5aa42a58
parent2b6cce2c7c1a53680b974fa0a3a17a83a8702732
merge_trunk

bzr revid: fp@tinyerp.com-20120713115345-nfvg7sraq6cmhrno