Merge branch 'master' into httptests

Author UbitUmarov <ajlduarte at sapo dot pt>
Author date 2017-11-12 12:11:29
Author local date 2017-11-12 12:11:29 +0000
Committer UbitUmarov <ajlduarte at sapo dot pt>
Committer date 2017-11-12 12:11:29
Committer local date 2017-11-12 12:11:29 +0000
Commit 17c65d918a978b6908131a1cae7ccaddeb70d9c5
Tree 939e0406f9dd6373ff03f897be3257122a5a2dae
Parent cdb7d506fd5ceb7f77f5d5efd47acf28f61d27d9
Parent 6546ea6da642f9b4c8bb03ee7e43741352820bd9
Merge branch 'master' into httptests
Affected files:
ViewGit