Merge branch 'master' of ssh://jolly@www.mISDN.org/var/git/lcr
authorAndreas Eversberg <jolly@eversberg.eu>
Tue, 27 Oct 2009 06:56:59 +0000 (07:56 +0100)
committerAndreas Eversberg <jolly@eversberg.eu>
Tue, 27 Oct 2009 06:56:59 +0000 (07:56 +0100)
commit8994874d7bcb1eff9ee833fb22e4910cc365f456
tree143d370a0a65449dfb7c9dd5e00cbb8841a250a9
parentb987a1bbbcabbf183ebe009903778671a1591337
parent320159175adced71da64efa80e9334f7bcab96c8
Merge branch 'master' of ssh://jolly@mISDN.org/var/git/lcr

Conflicts:
README
README