Merge branch 'master' of github.com:reverbrain/eblob
commit84659591ef6c76638d44f7c306f85c660e47c5bf
authorEvgeniy Polyakov <zbr@ioremap.net>
Thu, 8 Nov 2012 19:34:24 +0000 (8 23:34 +0400)
committerEvgeniy Polyakov <zbr@ioremap.net>
Thu, 8 Nov 2012 19:34:24 +0000 (8 23:34 +0400)
tree2841bd35369a4c996e5d4255f9a2e61832016cf7
parentc26c18935ba3c95051338ac50c5c93ba45eb4f7c
parentb9718a5090fe2e2c1f3d2bcee3165d6b3566c841
Merge branch 'master' of github.com:reverbrain/eblob

Conflicts:
README
README