Merge branch 'master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 25 Oct 2013 08:39:20 +0000 (10:39 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 25 Oct 2013 08:39:20 +0000 (10:39 +0200)
commitb273bcb0d5c95b2dde402576163823b8ce28e297
tree61238ce0cef21e270ba1747bace97319eeb362ec
parent4f24923bd74759b7b7b89aff5bce15e4b8f344bf
parent2d005b6ef6e826470fa4edfe516242eff74641d2
Merge branch 'master' into erp5-component