Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 4 Apr 2014 07:29:56 +0000 (09:29 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Fri, 4 Apr 2014 07:29:56 +0000 (09:29 +0200)
commitb55db998452d3b46e83e1cac9a398462d8e6d596
tree3769a79b9788a25d2e68eb1da35c16c58360b16b
parentb58adfe2f6676975ae37a788fd23afef8d22e520
parentbd9b73140faf237ec482344845658d003201279e
Merge remote-tracking branch 'origin/master' into erp5-component