merge latest release 2.4.0 upstream upstream/2.4.0
authorImran Zaman <imran.zaman@intel.com>
Thu, 12 Feb 2015 13:39:52 +0000 (15:39 +0200)
committerImran Zaman <imran.zaman@intel.com>
Thu, 12 Feb 2015 13:40:07 +0000 (15:40 +0200)
commit7ee5f273fadddd0f62d4c26c5ad7a366d1408664
tree209dfc43779f8e7c3f7ec4191fbf9f875fb5a3e7
parentdff5b37a0508c8c19410fde0ff0b57ac9bdf0fa4
parent799c0b9e651780879f2b25123af0a2db7dcbf3e6
merge latest release 2.4.0