[dss-merge-requests] Pending merge requests

[daemon at developer.digitalstrom.org]

Merge request list for 'dSS-mainline' (URL: http://gitorious.digitalstrom.org/dss/dss-mainline/merge_requests.atom):

Summary: #730: Catch BusApiError exception for metering queries to inactive devices
 - By: mtross
 - URL: http://gitorious.digitalstrom.org/dss/dss-mainline/merge_requests/346

Summary: #367: add compile option for http
 - By: mtross
 - URL: http://gitorious.digitalstrom.org/dss/dss-mainline/merge_requests/210