Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 28 Jul 2014 22:57:52 +0000 (07:57 +0900)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Mon, 28 Jul 2014 22:57:52 +0000 (07:57 +0900)
commitf065d513c22108879eac6dfb3faa7265f35bdc89
treeeee5701e80b41c1fbfac12866ebd9297ed767ee7
parente944a7c4a7ffeacba60325eaf45ddd3720ba8d34
parent029f8a86166b25f4aa4314368be3ee452809c260
Merge remote-tracking branch 'origin/master' into erp5-component