Merge branch 'master' into erp5
authorŁukasz Nowak <luke@nexedi.com>
Wed, 29 Jun 2011 09:09:26 +0000 (11:09 +0200)
committerŁukasz Nowak <luke@nexedi.com>
Wed, 29 Jun 2011 09:09:26 +0000 (11:09 +0200)
commit598e5978862527ef35246ae21d622a75b210de1c
tree4adb69ccac99fc9f5bc3410bfac3aa4f6c2b570c
parentcdff9aa0dbdd34488c1a5874d22bb71c5c831e81
parent4bd5d656a3485d4ff36d4efd47ed722f23a02138
Merge branch 'master' into erp5