Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorHenrique <henrique@henrique-vb.(none)>
Fri, 10 May 2013 23:23:07 +0000 (01:23 +0200)
committerHenrique <henrique@henrique-vb.(none)>
Fri, 10 May 2013 23:24:17 +0000 (01:24 +0200)
commit2a592b2d2aed4465c1e4eab4aa8ac259bccac2fb
tree14583e881e7857c3540dc297c4598eed078c7780
parent99be0275e128d2ec239cc43d96280d1fdf0cd816
parentf680e95f19f54fa287c56668d215448489352921
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift