Merge branch 'master' into erp5testnode
authorŁukasz Nowak <luke@nexedi.com>
Fri, 23 Dec 2011 15:32:41 +0000 (16:32 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Fri, 23 Dec 2011 15:32:41 +0000 (16:32 +0100)
commit4c22afe6903eb505ebfa3bcca4fe9f353693aca4
tree1507d532507a8b7ef5bf2123ca19b173d97aa8c5
parent20ef81b295f9e806fec1cc3bacbcc226d292b607
parent6ada966b625419758c839aff1970f505be74a837
Merge branch 'master' into erp5testnode
software/erp5testnode/software.cfg