Commit before pull from upstream.
Merge branch 'master' of https://github.com/woothemes/woocommerce
Add 'woocommerce_sort_countries' filter
Finish Translation for admin-ro_RO

100% - translated the new strings and made some small corection on the
one old ones
Fix tabs/whitespace
When performing search include post_excerpt
Remove filter after loop
Update admin/woocommerce-admin-settings.php

Remove unnecessary <div> close to prevent issue on payment gateways tabs (bacs, paypal)
Merge pull request #2127 from swoelffel/patch-1

Update admin/woocommerce-admin-settings.php
Cleaned up description hooks Closes #2125.
Merge pull request #2119 from krbvroc1/search_excerpt

On product search include post_excerpt
Readme
Merge pull request #2118 from a1ur3l/master

Finish translation for admin-ro_RO
Merge pull request #2114 from krbvroc1/optional_sort

Add 'woocommerce_sort_countries' filter
Chosen update Closes #2129.
Fix options. Closes #2116.
Don't show an empty div element if there's no page description
css class name consistency #2086
breadcrumb markup and more appropriate separator
encode the slash..