Checkout
pburba
committed
on 06 Oct 12
Merge the inheritable-props branch back to trunk.

See http://svn.haxx.se/dev/archive-2012-09/0177.shtml