Merge remote-tracking branch 'origin/erp5-luke' into erp5
authorŁukasz Nowak <luke@nexedi.com>
Thu, 5 Apr 2012 11:16:39 +0000 (13:16 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Thu, 5 Apr 2012 11:16:39 +0000 (13:16 +0200)
commita026f2e7b2f6e6ece126ba602e1ba2ec91e8a0c9
treea60ac8832db43d0320783942157201c95050f760
parent83d6dd1baf89164995b73e9e94e164d2446f5c17
parent49632f9cb83642db4de76ad1fce20ca5d08099d8
Merge remote-tracking branch 'origin/erp5-luke' into erp5