Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 1 Feb 2014 07:16:37 +0000 (08:16 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Sat, 1 Feb 2014 07:16:37 +0000 (08:16 +0100)
commit5859e9e600e6e689f5d2f02b6687f3df781b1df9
tree85df8dbc7a300c347378df44a9f32d564dc17eb6
parent99e2c33da6d190403e8c673bcd75885ffa5416ad
parent38835c7915daf68b82280be46210fc072b47bff8
Merge remote-tracking branch 'origin/master' into erp5-component