merge
authorFabien Pinckaers <fp@tinyerp.com>
Sat, 17 Sep 2011 15:01:41 +0000 (17:01 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Sat, 17 Sep 2011 15:01:41 +0000 (17:01 +0200)
commit14b6faf57e0bc6bfe3bdcfac4a3dc992060bfc49
treeed3ff704ebc5e53867928dafc772e95a9035db72
parent78f60c63f2b75fc81a23481a17034ec0acee246f
parent670621875eacdd31a5213e89d090aca88dc32576
merge

bzr revid: fp@tinyerp.com-20110917150141-mp36jj3tqb9ure6y