Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 3 Mar 2014 10:42:11 +0000 (11:42 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 3 Mar 2014 10:42:11 +0000 (11:42 +0100)
commitb22afdd86419ebace441a68e7c67993f1c5531ce
treee025c6bf292f72ff509d7a64429ab36505aad417
parent38b77eefa7affb790d59a33def92746a6a72170e
parentc56da5c437504f1fecbd97d012273103d2af9684
Merge remote-tracking branch 'origin/master' into erp5-component
stack/slapos.cfg