[MERGE] 5.0.0-server
authorStephane Wirtel <stephane@tinyerp.com>
Fri, 6 Feb 2009 20:07:00 +0000 (21:07 +0100)
committerStephane Wirtel <stephane@tinyerp.com>
Fri, 6 Feb 2009 20:07:00 +0000 (21:07 +0100)
commit6f06582e37e2bc1ddf225e1d29807ee1d900d5c9
tree9e6c8e3685cb29b995b7e3eb52cb7ad76ebfa41d
parent2acfff6a931f436e108cde117aab5687c2fa3f3d
parent3dd3209b36275c3461b65da2e094251352b44706
[MERGE]

bzr revid: stephane@tinyerp.com-20090206200700-3x6vlk0k6j79l1bv