Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorhenrique <henrique@apache.org>
Thu, 29 Aug 2013 07:45:55 +0000 (09:45 +0200)
committerhenrique <henrique@apache.org>
Thu, 29 Aug 2013 07:45:55 +0000 (09:45 +0200)
commit7570b84301097248d22a211f21527e2c2ffa8520
tree8fc74e05e2e944e3318a919f1f98d8ec58139911
parent2fdd916b8bd30a72a496b203e98a0daaadc1d626
parent9df014012e6fb2f831a49b6f7431380566483048
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift