Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorRoger Meier <roger@apache.org>
Tue, 27 May 2014 21:57:38 +0000 (23:57 +0200)
committerRoger Meier <roger@apache.org>
Tue, 27 May 2014 21:57:38 +0000 (23:57 +0200)
commit44460e2e7a79c0e06bb473379c161353bc733cf8
treea5e16f34247afb78c19a4512d729c8e85dc5acde
parent5c6ad2427c67023a67e873d2e389838394053272
parent0cf802a366f8ad315665194d406fd2d59df5ac34
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift