Merge remote-tracking branch 'origin/master' into erp5
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 11 Feb 2015 12:54:03 +0000 (13:54 +0100)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Wed, 11 Feb 2015 12:54:03 +0000 (13:54 +0100)
commitbd10da56c19940918e18d02d7873f9dd1b06729d
tree745513e47905aebd726911f470dbaa33665da97d
parent812cee018d70f6f6d46cfc16af3cfd1f55040882
parent76b41147f7be50eb84d0b40aed2be4922e61ae1f
Merge remote-tracking branch 'origin/master' into erp5