Merge remote-tracking branch 'origin/master' into erp5-component
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 30 Apr 2014 19:57:50 +0000 (21:57 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 30 Apr 2014 19:57:50 +0000 (21:57 +0200)
commit1fd890f5a0bdb874f7e2ba50874ae509a856f16c
tree8d8348b00bdf256f0999ad39c9a648ce5d94b6d1
parent601b22918542db0e39c56af6db77f907a363fe61
parent8a62619be6769168a662942bbd0c9f5feea9fbf2
Merge remote-tracking branch 'origin/master' into erp5-component