Merge commit '52b4abdcb351830f5493a50c4181ef3947f3feab'
authorHarald Welte <laforge@gnumonks.org>
Thu, 25 Mar 2010 04:18:14 +0000 (12:18 +0800)
committerHarald Welte <laforge@gnumonks.org>
Thu, 25 Mar 2010 04:18:14 +0000 (12:18 +0800)
commit692df15c8194cd98cbb4d89465ae707ba30bb9b6
treee5de2221ffddfbe5b1b0bf5abab4ae7d803b8228
parent3533cd39b106122e58d72e9e0240ab25fab90bc8
parent52b4abdcb351830f5493a50c4181ef3947f3feab
Merge commit '52b4abdcb351830f5493a50c4181ef3947f3feab'

Conflicts:
src/shared/libosmocore/src/utils.c
src/shared/libosmocore/.gitignore
src/shared/libosmocore/Makefile.am
src/shared/libosmocore/configure.in
src/shared/libosmocore/git-version-gen
src/shared/libosmocore/include/osmocore/gsm48.h
src/shared/libosmocore/include/osmocore/msgb.h
src/shared/libosmocore/include/osmocore/rsl.h
src/shared/libosmocore/m4/DUMMY
src/shared/libosmocore/src/gsm48.c
src/shared/libosmocore/src/rsl.c
src/shared/libosmocore/src/utils.c