Merge remote-tracking branch 'origin/master' into erp5testnode
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 11 Feb 2014 07:37:13 +0000 (08:37 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Tue, 11 Feb 2014 07:37:13 +0000 (08:37 +0100)
commitf8e586d4e4736e0991478c881dd3a93a059a9538
tree1e5352f7326985893ad32f0ba26ad07ac7448b7b
parent938c987db5118646194814df2ae904cec7251f1a
parent09cb5128bc418ea67e706c404e30453bfdc901ad
Merge remote-tracking branch 'origin/master' into erp5testnode

Conflicts:
component/busybox/buildout.cfg
component/ca-certificates/buildout.cfg
component/firefox/buildout.cfg
component/gtk-2/buildout.cfg
component/xorg/buildout.cfg
software/erp5testnode/software.cfg
component/alsa/buildout.cfg
component/firefox/buildout.cfg
software/erp5testnode/instance-default.cfg
software/erp5testnode/software.cfg
software/seleniumrunner/software.cfg