Merge branch 'v0.10'
authorFedor Indutny <fedor.indutny@gmail.com>
Tue, 10 Dec 2013 19:36:41 +0000 (23:36 +0400)
committerFedor Indutny <fedor.indutny@gmail.com>
Tue, 10 Dec 2013 19:36:41 +0000 (23:36 +0400)
commitba706bacf31a0ebaf5e97dec2fa3f1b3b04a17d5
tree2fe99848e1678216990aee5821299c253c11fc58
parent1e066e4a4a88f97af865d965f104b5fe8136797f
parentf16edd2632930e3fbfead4d6d52eeac87824f1a6
Merge branch 'v0.10'

Conflicts:
src/node_file.cc
src/node_file.cc