Merge remote-tracking branch 'origin/erp5' into erp5-z2.13
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 14 Feb 2013 03:48:31 +0000 (04:48 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 14 Feb 2013 03:48:31 +0000 (04:48 +0100)
commit81e12ea88c723e76bd8f700e08ceb4d6d69cd78b
tree4cef91745b0be20926568600e8c20b953754ba95
parent40258997bbb06166d08d5914e8f70259f7dbe4ee
parentff8d2094cbe3293b50d15ee294167aba3d207966
Merge remote-tracking branch 'origin/erp5' into erp5-z2.13

Conflicts:
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg