Merge branch 'master' of https://git.erp5.org/repos/slapos into networkcache_signature
authorLucas Carvalho <lucas@nexedi.com>
Fri, 22 Jul 2011 08:22:16 +0000 (10:22 +0200)
committerLucas Carvalho <lucas@nexedi.com>
Fri, 22 Jul 2011 08:22:16 +0000 (10:22 +0200)
commit31864d2cf41340190b52a1392b598369ef71a570
treea19405008e402971e887a5c3a75e46eaee0c9e20
parent562637459684d52811eea991d2775bad576c0144
parent20808621cd91073b1b1be22fb1a19b42faf94c29
Merge branch 'master' of https://git.erp5.org/repos/slapos into networkcache_signature