tree cc5d2f01f11d2367d53ed90fd9753ef58ec1e988
parent c2e302dc84490691b17fcfa6246e40eaf9a0ab32
parent 42b40072dc5793766480731f11ca68f8301c48b2
author Harald Welte <laforge@gnumonks.org> 1246796346 +0200
committer Harald Welte <laforge@gnumonks.org> 1246796346 +0200

Merge commit 'origin/master'