Merge branch 'v0.10'
authorBert Belder <bertbelder@gmail.com>
Mon, 13 May 2013 18:13:39 +0000 (11:13 -0700)
committerBert Belder <bertbelder@gmail.com>
Mon, 13 May 2013 18:13:39 +0000 (11:13 -0700)
commitbdc58811693fd4454b5c99cbbbdaddbce3950f6f
tree982ab861e3dd1c941bb5ad0782840669a8c4caf1
parent8db693a87e324d2354d253990e3f75a149c029e3
parent21bd45676390fd21ffa7c3cca91af4ad37ed3e5c
Merge branch 'v0.10'

Conflicts:
tools/test.py
doc/api/stream.markdown