Merge branch 'erp5' into vifib
authorRafael Monnerat <rafael@nexedi.com>
Mon, 13 Jun 2011 14:43:36 +0000 (11:43 -0300)
committerRafael Monnerat <rafael@nexedi.com>
Mon, 13 Jun 2011 14:43:36 +0000 (11:43 -0300)
commit2901f28a357375bf1769dc62c146fbc44a86c982
tree71ed74ce6870f51ce2b86944bc27652ecc94d239
parent59fbe1f929d4fc58a0954368d61cbfaf58eb9387
parenta9a394db69edbd19429470032ce56699bc9312c0
Merge branch 'erp5' into vifib
stack/erp5.cfg