Merge branch 'develop'
authorAndreas Eversberg <jolly@eversberg.eu>
Thu, 14 Jul 2011 12:25:42 +0000 (14:25 +0200)
committerAndreas Eversberg <jolly@eversberg.eu>
Thu, 14 Jul 2011 12:25:42 +0000 (14:25 +0200)
commitda91d7d85fe092122e35ece52695f98345738359
treea06ffff8291b8f61441ef75b28a4184824806af5
parent129a76d1411166176db646138b35e8f5ed9907a2
parent2f5c3dc13063fc5e4cc4b72d2c3484be238c142e
Merge branch 'develop'

Conflicts:
Makefile.in
README
chan_lcr.c
configure
gsm_bs.cpp
gsm_ms.cpp
interface.c
route.c
Makefile.in
configure
gsm_bs.cpp
gsm_ms.cpp