Merge remote-tracking branch 'upstream/v0.10'
authorTimothy J Fontaine <tjfontaine@gmail.com>
Fri, 14 Feb 2014 00:40:38 +0000 (16:40 -0800)
committerTimothy J Fontaine <tjfontaine@gmail.com>
Fri, 14 Feb 2014 00:40:38 +0000 (16:40 -0800)
commit6b4f72b7ac95bf3ec100bb70e7f6552e9aa18d7e
tree361cb4725010c5006909b704e478396e891b057e
parente8df2676748e944388896dfd767e01906ae2e4eb
parent55543d3c45777e2867b86109454e1686e9956c5f
Merge remote-tracking branch 'upstream/v0.10'

Conflicts:
doc/blog/feature/streams2.md
Makefile
doc/api/timers.markdown