tree f9b17bdf73ee2b56f5ae7e710c01448c30ada88a
parent 28965f626fc6d02589a6c9054c77b8e07d592f3f
parent 513ed308c32a88a5f793846cb20afd1cd9dcaa91
author Harald Welte (local) <laflocal@hanuman.gnumonks.org> 1250278721 +0200
committer Harald Welte (local) <laflocal@hanuman.gnumonks.org> 1250278721 +0200

Merge commit 'har/stefan'