From: bdarnell <ben@bendarnell.com>
Date: Mon, 7 May 2012 04:36:39 +0000 (-0700)
Subject: Merge pull request #484 from vadimg/master
X-Git-Tag: v2.3.0~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de3cf92a962f346c666ddc138aa1e6ec84b99d4b;p=thirdparty%2Ftornado.git

Merge pull request #484 from vadimg/master

make commandline args override config file args when multiple=True
---

de3cf92a962f346c666ddc138aa1e6ec84b99d4b