Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 13 Feb 2014 12:54:39 +0000 (13:54 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 13 Feb 2014 12:54:39 +0000 (13:54 +0100)
commite688519522540b9b42ff252cb169dca64dc5ddea
treececd6bcdd5ce1f05891718b6e80bde6ce5e6265e
parent8ef0ac9d44b6c04f417054ce4900d4fbfd007514
parent511d2c1ef2cbda1c53ac92782140cb4b3bef0de9
Merge remote-tracking branch 'origin/master' into erp5-component
component/xorg/buildout.cfg