Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 22 May 2014 07:15:57 +0000 (09:15 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 22 May 2014 07:15:57 +0000 (09:15 +0200)
commit82d2d64570b8f0022cbcb0fd95b15f58ffa65a25
tree2b4612c6abfc96424e3cd704febd886683682936
parent252a5425860c172cd4e8cc0a3ad5d10514a9511d
parent5b2b751e3effdc7b3739cc0b99529a1bc1b08bc7
Merge remote-tracking branch 'origin/master' into erp5-component