Merge remote-tracking branch 'origin/master' into erp5
authorŁukasz Nowak <luke@nexedi.com>
Wed, 25 Jan 2012 15:08:14 +0000 (16:08 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Wed, 25 Jan 2012 15:08:14 +0000 (16:08 +0100)
commitb3cf1cbb69cc45190624df7c591fcc1be56cfe7b
tree26afaa724edec7c006bc99587991fd7aaace66a0
parent837827921a92c8fb38336df0b069fa94d22706ed
parenta3d5ed82310d31f97963e8fc39ef57e7a0f982c4
Merge remote-tracking branch 'origin/master' into erp5

Conflicts:
component/git/buildout.cfg
component/openssl/buildout.cfg
setup.py
component/openssl/buildout.cfg
component/readline/buildout.cfg
setup.py