Merge branch 'master' into shellinabox
authorAntoine Catton <acatton@tiolive.com>
Thu, 12 Jan 2012 12:34:27 +0000 (13:34 +0100)
committerAntoine Catton <acatton@tiolive.com>
Thu, 12 Jan 2012 12:34:27 +0000 (13:34 +0100)
commitc7ed32337de3210a52117992226eb0e498549fa4
treed8350f227281b42f1e3722761ad6c9987955913c
parent05b9f7fbb961be998330b6d570e04463beb682b2
parent5179aa88c4e056f1eab89b13eab7dd7a57bd6a41
Merge branch 'master' into shellinabox

Conflicts:
software/erp5testnode/software.cfg
software/erp5testnode/software.cfg