Merge branch 'master' of https://github.com/resetius/elliptics
commit3f827ea4693907fb2729a6367ebb5c699b87634b
authorAlexey Ozeritsky <aozeritsky@yandex-team.ru>
Thu, 22 Nov 2012 12:30:00 +0000 (22 16:30 +0400)
committerAlexey Ozeritsky <aozeritsky@yandex-team.ru>
Thu, 22 Nov 2012 12:30:00 +0000 (22 16:30 +0400)
tree3489d044f7f32f03c5fd20946e2b992eba6fe426
parentcde9d34d5e2d4dfdb0efe364df872c14c24f792b
parent3627ef21456f48f1ec7579d687ae2f1741dbbfb3
Merge branch 'master' of https://github.com/resetius/elliptics