Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorJens Geyer <jensg@apache.org>
Mon, 29 Apr 2013 20:10:35 +0000 (22:10 +0200)
committerJens Geyer <jensg@apache.org>
Mon, 29 Apr 2013 20:10:35 +0000 (22:10 +0200)
commit1077ed678d532850c5bff866124934197bbd0979
treeddcfb2ef607c67fa1707c8ab3cd199a8a20c0cce
parentb706b1a905ce5eb8b195300c585caf53a8272c11
parent9a3a5642b867498470f4c722738f1b12c10b970b
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift