tree 193db7cd4e6667d52f965e419d12c69ccea7c63f
parent be3e3784dc435cc64f70b0afef299097f9884c1d
parent c2e302dc84490691b17fcfa6246e40eaf9a0ab32
author Harald Welte <laforge@gnumonks.org> 1246795801 +0200
committer Harald Welte <laforge@gnumonks.org> 1246795801 +0200

Merge branch 'master' into sms