[12/15] git commit: Merge remote-tracking branch 'origin/master' into olingo263

[ilgrosso]

Merge remote-tracking branch 'origin/master' into olingo263


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/7c079a1a
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/7c079a1a
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/7c079a1a

Branch: refs/heads/master
Commit: 7c079a1a788b75d325400e1f88fe07b09c7d6b56
Parents: 3b36600 d765801
Author: Francesco Chicchiriccò <ilgro...@apache.org>
Authored: Mon May 5 12:22:37 2014 +0200
Committer: Francesco Chicchiriccò <ilgro...@apache.org>
Committed: Mon May 5 12:22:37 2014 +0200

----------------------------------------------------------------------
 .../communication/request/AbstractRequest.java  | 16 +++++----
 .../http/ProxyWrapperHttpClientFactory.java     |  4 +++
 .../apache/olingo/client/core/uri/URIUtils.java | 36 ++++++++++++++++----
 .../commons/core/data/AbstractODataError.java   | 19 +++++++++++
 4 files changed, 63 insertions(+), 12 deletions(-)
----------------------------------------------------------------------