3781: Merge branch '3781-browser-friendly-servers' into 3781-browser-upload
authorTom Clegg <tom@curoverse.com>
Wed, 26 Nov 2014 07:25:40 +0000 (02:25 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 26 Nov 2014 07:25:40 +0000 (02:25 -0500)
commit29b0dccdf90d3cf1e7472f0653cc9a38cbbadc26
tree9a45836a27c40b192e930c651d4f539319251f0a
parent12b9d77ecca3043b65015860359ce447b68fccfb
parent21d528de3cd07b28e7b6bb2e195bc64e2b8abc15
3781: Merge branch '3781-browser-friendly-servers' into 3781-browser-upload