Merge branch 'master' into httptests

Author UbitUmarov <ajlduarte at sapo dot pt>
Author date 2017-09-16 00:00:28
Author local date 2017-09-16 01:00:28 +0100
Committer UbitUmarov <ajlduarte at sapo dot pt>
Committer date 2017-09-16 00:00:28
Committer local date 2017-09-16 01:00:28 +0100
Commit 5687c5d494380f9ecd074974f14b55acdb102ff7
Tree 73b80ab78e3ef27333e740b4a72bf2fb67dac5e6
Parent b581a64788b348af756a1c12bea1a4ad3c82c28c
Parent 997a85568e5eed736fe273c7cdeb5736c8ce420f
Merge branch 'master' into httptests
Affected files:
ViewGit