tree dfa4372733ad6d1723b3e85e96af069f7a54094b
parent 6afa63e998591f990f08488f91574afac1dfc7d6
parent de6c410bff7b084b71408e760d3e30c981204db7
author Harald Welte <laforge@gnumonks.org> 1249597983 +0200
committer Harald Welte <laforge@gnumonks.org> 1249597983 +0200

Merge branch 'master' into sms