Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
authorJens Geyer <jensg@apache.org>
Thu, 21 Mar 2013 17:59:45 +0000 (19:59 +0200)
committerJens Geyer <jensg@apache.org>
Thu, 21 Mar 2013 17:59:45 +0000 (19:59 +0200)
commit4dd54b6d4ab6603175226810de853a2499ae97a3
treecb3ad4660a02dd5521aaed2b7871f040a10b84ec
parent7af5868e57b35d5d5e9427484f884cc6af002bbd
parent552440e6e522499d974800c98c5f4dd869dc29c7
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift