Merge branch 'erp5' slapos-0.30
authorRafael Monnerat <rafael@nexedi.com>
Mon, 18 Jul 2011 18:46:21 +0000 (15:46 -0300)
committerRafael Monnerat <rafael@nexedi.com>
Mon, 18 Jul 2011 18:46:21 +0000 (15:46 -0300)
commit584c17a2b01c609f90d3cdb5789edd669824f441
tree8459d902462e3bcdceaea9b742c24f469faa65e5
parent273813684db13ac624fd0e2d5aed6be342c00fa1
parent3e561d8dcb100c9f9d2b8e2fba1382bb77ed40f6
Merge branch 'erp5'