From: Avery Pennarun <apenwarr@gmail.com>
Date: Tue, 1 Feb 2011 08:22:07 +0000 (-0800)
Subject: Merge branch 'mux'
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e529cf13b5660cd64e10aac1dd35fac9811b27af;p=packages%2Fb%2Fbup.git

Merge branch 'mux'

* mux:
  If you specified the port number on the command line, convert it to an int.
  Add `bup daemon` command for simple socket server
  Add DemuxConn and `bup mux` for client-server
---

e529cf13b5660cd64e10aac1dd35fac9811b27af