Merge branch 'conduit-free'
authorEugene Crosser <crosser@average.org>
Sun, 20 Apr 2014 15:49:08 +0000 (19:49 +0400)
committerEugene Crosser <crosser@average.org>
Sun, 20 Apr 2014 15:49:08 +0000 (19:49 +0400)

Trivial merge