Merge remote-tracking branch 'origin/erp5-luke' into erp5
authorŁukasz Nowak <luke@nexedi.com>
Thu, 5 Apr 2012 13:51:39 +0000 (15:51 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Thu, 5 Apr 2012 13:51:39 +0000 (15:51 +0200)
commitdac02d85e46209a05884ff46d98dbd6e0b58c04c
treefa9adaea4e623c5e7382cb808a12e3187f032098
parenta026f2e7b2f6e6ece126ba602e1ba2ec91e8a0c9
parentbc32dcd857143ba77dd529114b1e753b26fadfa1
Merge remote-tracking branch 'origin/erp5-luke' into erp5