tree da70f2addbfd2899b61f5e310afe9d7070d70317
parent a1b285861e966346df9f6974fe6de499ba3e98fc
parent 67ce073110b390997fd08c69b44c6b5d9f6a3cef
author Harald Welte <laforge@gnumonks.org> 1249579222 +0200
committer Harald Welte <laforge@gnumonks.org> 1249579222 +0200

Merge branch 'master' into sms