Merge branch 'erp5' into erp5-generic
authorŁukasz Nowak <luke@nexedi.com>
Wed, 7 Dec 2011 12:31:42 +0000 (13:31 +0100)
committerŁukasz Nowak <luke@nexedi.com>
Wed, 7 Dec 2011 12:31:42 +0000 (13:31 +0100)
commita20d835a348f9ee431c237ab2cb06acce7d373fc
tree391fefd509966f98b4fff66c0eead3e77e0e87a5
parent5c9ef43746fcd88951d9999c3275d4947d4954c1
parent6cd565b552991f86f7959df71ec4288c2a89fe17
Merge branch 'erp5' into erp5-generic