Merge branch 'master' of github.com:reverbrain/elliptics
commit649084b2f07a7015c8a575f12e70b042588dd573
authorEvgeniy Polyakov <zbr@ioremap.net>
Thu, 22 Nov 2012 17:06:57 +0000 (22 21:06 +0400)
committerEvgeniy Polyakov <zbr@ioremap.net>
Thu, 22 Nov 2012 17:06:57 +0000 (22 21:06 +0400)
tree176680830aa470518034c5b4d2f2a693ff8b5b50
parentd681a60b0593244e4e0bb9be0a715a8e8c8f76e9
parentc40c9b4cb73584aa5f8edaa8823fe4206291a97a
Merge branch 'master' of github.com:reverbrain/elliptics