Merge remote-tracking branch 'origin/master' into erp5testnode
authorKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 15 May 2014 12:05:23 +0000 (14:05 +0200)
committerKazuhiko Shiozaki <kazuhiko@nexedi.com>
Thu, 15 May 2014 12:05:23 +0000 (14:05 +0200)
commitfb4cd7cd0cf0911c56f6fbbc9b0c63880d38d0f9
tree7fac7e77f27484c9fb268b87a2f65dda99c865fb
parent3c135f052eb2c819c05e067f8f49aafc5183db62
parent3365305c3aaca1f85f8ba5f167137f924ac35ab0
Merge remote-tracking branch 'origin/master' into erp5testnode