Merge branch 'daemon' of ssh://gorch/~crh/work/code/Prequel-git into daemon
authorcrh <crh@ubiqx.org>
Fri, 1 Jun 2012 18:13:09 +0000 (13:13 -0500)
committercrh <crh@ubiqx.org>
Fri, 1 Jun 2012 18:13:09 +0000 (13:13 -0500)
commit557f8afcccb2d85d931d74731974bae7c4f3258c
treec64480e02d73a2abf43a749e4cad78998a6f34a4
parent7b1bf66009a1d180b69e96bf15ffc573b6397d9e
parentbf28eb6887d5c0d254069ab4531d347c32d736d6
Merge branch 'daemon' of ssh://gorch/~crh/work/code/Prequel-git into daemon