Merge branch 'master' into nosqltestbed
authorGuillaume Bottex <guillaume.bottex@nexedi.com>
Tue, 26 Jul 2011 13:53:50 +0000 (15:53 +0200)
committerGuillaume Bottex <guillaume.bottex@nexedi.com>
Tue, 26 Jul 2011 13:53:50 +0000 (15:53 +0200)
commit3fd4798af5d3cb12064664ae447953062d409e6b
tree7df4da87303395be694705335cc81b4fabbf116e
parente2ffb0edfb919b1fc42eff8f6848c22ab8cb683b
parent9eb03aa857960d112521baf61486d1a386094e27
Merge branch 'master' into nosqltestbed