Merge branch 'master' into graceful_stop
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 17 Apr 2012 10:49:12 +0000 (12:49 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 17 Apr 2012 10:49:12 +0000 (12:49 +0200)
commit3597c200e3876e2c7a44e6eca0d60fab397de900
treefcc03972fd7f64499663af876f645bb835c857cc
parentaff78cecdb2c7292899ae15ee8a5fd41accef2b5
parentfee3c45cf4ce01083218e41622f54e5fced0fadf
Merge branch 'master' into graceful_stop
src/filter_frontend_net.cpp