tree 9f61030208204acd5db91ee4d88d00f7b2be9ad0
parent 89cdce2ec02f12076340e2cf38a4f424393d6868
parent 63aba29ef75864a42fd38458fbd04a9be997f3b6
author Harald Welte <laforge@gnumonks.org> 1246692107 +0200
committer Harald Welte <laforge@gnumonks.org> 1246692107 +0200

Merge branch 'master' into sms