Merge branch 'erp5' into vifib
authorRafael Monnerat <rafael@nexedi.com>
Mon, 13 Jun 2011 01:30:24 +0000 (22:30 -0300)
committerRafael Monnerat <rafael@nexedi.com>
Mon, 13 Jun 2011 01:30:24 +0000 (22:30 -0300)
commit46f0f8f18c7fd64f8f35e1aad9edf38f2918c7f1
treeff8cc1cf2a36563e6c7e22f8849bf15c77ed10bc
parent75cefd45cbb00287cf8cea6cd7c69a7db1d49b44
parent84bbc99c8037556198317c4f57eabb2bfb0ce8b0
Merge branch 'erp5' into vifib