Merge remote-tracking branch 'upstream/erp5' into upstream-erp5-generic
authorŁukasz Nowak <luke@nexedi.com>
Fri, 9 Dec 2011 15:26:03 +0000 (16:26 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Fri, 9 Dec 2011 15:26:03 +0000 (16:26 +0100)
commitb58062c878f4d2ba6deec241f1650b47fdf35c2b
tree629c7bdcc9c6faba7b63dcae2a7ca7b4af477d80
parenta20d835a348f9ee431c237ab2cb06acce7d373fc
parent2164ff1020ec165525eca4eb83468e04b810476a
Merge remote-tracking branch 'upstream/erp5' into upstream-erp5-generic