Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 3 Jan 2014 08:55:07 +0000 (09:55 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 3 Jan 2014 08:55:07 +0000 (09:55 +0100)
commit8c0cac2d75553391293ae0c0baf888b2d8df9eb8
tree10c579437fb67851b4e6a321358b19402dbd75e0
parentba4d2d6fd9eb1252a2421059201c9f44a16e543b
parente1f23727e4b5047285da764c1707523571c08dc7
Merge remote-tracking branch 'origin/master' into erp5-component