[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: #601: fix ds3 API
 - By: winkj
 - URL: http://gitorious.digitalstrom.org/dss/dss-mainline/merge_requests/284

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