dispatcher: merge branch 'danw/policy-based-routing-rh1160013'
authorDan Winship <danw@redhat.com>
Mon, 12 Jan 2015 14:54:12 +0000 (09:54 -0500)
committerDan Winship <danw@redhat.com>
Mon, 12 Jan 2015 14:54:35 +0000 (09:54 -0500)

Trivial merge