Merge branch 'erp5' into erp5-librsvg
authorRafael Monnerat <rafael@nexedi.com>
Tue, 1 May 2012 03:27:29 +0000 (00:27 -0300)
committerRafael Monnerat <rafael@nexedi.com>
Tue, 1 May 2012 03:27:29 +0000 (00:27 -0300)
commit66ea78f0b7c62aa01152c50935130a4a1d5bbcec
tree649b7913e16039dba28cc021fa067204c508ea24
parentcb6b534c608cd50e999d81829a50ae841331eda5
parent3679ef5f3183126c386b57fd4b79d94c54e2ae5e
Merge branch 'erp5' into erp5-librsvg