Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorhenrique <henrique@apache.org>
Thu, 29 Aug 2013 16:06:45 +0000 (18:06 +0200)
committerhenrique <henrique@apache.org>
Thu, 29 Aug 2013 16:06:45 +0000 (18:06 +0200)
commit5d9a72a28c4c082a4c155d539a20cf27d7440562
tree1ac92161605c61d08f2c5180e3c7e32c5944e1ee
parent7570b84301097248d22a211f21527e2c2ffa8520
parentcd54ec62492aa3f01c68910e5c942388d21c7379
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift