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)
commit3c383081597802c45ef5c6176c59d7d4880aea52
tree2c5b08eae86a09595d984ef2516f52517f44a0f5
parentbf6a214e1b52fff6dae06c6fca1fad478553f1ae
parente9bd43f05d25b506dab0344bc51e0211476b743a
Merge branch 'conduit-free'