merge 2 lines
commit6ffbc6e0d5e722137ea25249d066e5ca3c0a9991
authorMax Kellermann <max@foo-projects.org>
Sun, 16 Dec 2007 01:57:47 +0000 (16 01:57 +0000)
committerMax Kellermann <max@foo-projects.org>
Sun, 16 Dec 2007 01:57:47 +0000 (16 01:57 +0000)
tree65fb158c5ddfacf350012ef34ebd541247680c78
parent15986c54ea8121c3206a9dc8bad29b7cb2177fbb
merge 2 lines

git-svn-id: svn+ssh://foo-projects.org/var/svn/ferm/trunk@1014 887c3e53-ddf1-0310-8e39-e0d3fab4ed34
src/ferm