tree e047f6f37e98547dfe91ea5f1c5d7ffebbf1b8dc
parent f0075c75604ea09adf0b7d980f8635e38bab52ff
parent 42165564472132067e63f81f8b854178427009ad
author Marc Fisher <fisherii@google.com> 1435096255 -0700
committer Marc Fisher <fisherii@google.com> 1435096255 -0700

Merge pull request #15 from DrMarcII/master

Change to allow multiplex code to be used as a library.