Merge branch 'erp5' into erp5-cluster
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 23 Jan 2014 06:01:51 +0000 (07:01 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 23 Jan 2014 06:01:51 +0000 (07:01 +0100)
commitd0c0fe77f882719d4a331236d29ac5cb4606d13a
treefd55ba219e8740b87bffaadbce705fe7674ff7e2
parent411195163087e0c40e8f9bbb4b2b8deb98130968
parent852f2ddcc9d0e58ee9e3ec34271e4d39686c0a44
Merge branch 'erp5' into erp5-cluster

Conflicts:
component/glibmm/buildout.cfg
component/gtkmm/buildout.cfg
component/inkscape/buildout.cfg
component/libsigc/buildout.cfg
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg