tree dfa4372733ad6d1723b3e85e96af069f7a54094b
parent 99a452a197ca56f5892ad0e7263492101e7b7db4
parent 2477d93c6e2fbda33e423f5514d591ea64da1685
author Harald Welte <laforge@gnumonks.org> 1249597983 +0200
committer Harald Welte <laforge@gnumonks.org> 1249597983 +0200

Merge branch 'master' into sms